suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
shuo.wang
2024-05-07 14:27:21 +08:00
parent 51adc16ecc 3794a7a75b
commit a4b1bf009d
22 changed files with 132 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java
View File

@@ -62,9 +62,9 @@ public class EmployeeTrainingController {
@ApiOperation("培训-教练员-员工列表")
@PostMapping("/trainerUserList")
@ApiImplicitParams({
@ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成", required = true)
@ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成")
})
public ResponseResult<List<EmployeeTrainingVO>> trainerUserList(@RequestParam("status") Integer status) {
public ResponseResult<List<EmployeeTrainingVO>> trainerUserList(@RequestParam(value = "status", required = false) Integer status) {
return ResponseResult.success(employeeTrainingService.trainerUserList(CurrentUserHolder.getUserId(), status));
}

6
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniEmployeeTrainingController.java
View File

@@ -3,12 +3,14 @@ package com.cool.store.controller.webc;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.EmployeeTrainingService;
import com.cool.store.vo.EmployeeTrainingVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;

3
coolstore-partner-web/src/main/resources/application-ab.properties
View File

@@ -87,4 +87,5 @@ aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
aliyun.sms.signName=酷店掌
mybatis.configuration.variables.enterpriseId=e17cd2dc350541df8a8b0af9bd27f77d
mybatis.configuration.variables.enterpriseId=e17cd2dc350541df8a8b0af9bd27f77d
enterprise.dingCorpId=dingef2502a50df74ccc35c2f4657eb6378f

3
coolstore-partner-web/src/main/resources/application-local.properties
View File

@@ -82,4 +82,5 @@ aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
aliyun.sms.signName=酷店掌
mybatis.configuration.variables.enterpriseId=28c20a7b42b94171acb1ab3f631d69e1
mybatis.configuration.variables.enterpriseId=28c20a7b42b94171acb1ab3f631d69e1
enterprise.dingCorpId=ding0006ae30cf81071ea1320dcb25e91351

3
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -87,4 +87,5 @@ aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
aliyun.sms.signName=酷店掌
mybatis.configuration.variables.enterpriseId=28c20a7b42b94171acb1ab3f631d69e1
mybatis.configuration.variables.enterpriseId=28c20a7b42b94171acb1ab3f631d69e1
enterprise.dingCorpId=ding0006ae30cf81071ea1320dcb25e91351

1
coolstore-partner-web/src/main/resources/application.properties
View File

@@ -50,7 +50,6 @@ server.connection-timeout=18000000
server.tomcat.basedir=/tmp/tomcat/partner-b
log4j2.formatMsgNoLookups=true
enterprise.dingCorpId=dingef2502a50df74ccc35c2f4657eb6378f
wx.pay.merchantId=1670560201
wx.pay.privateKeyPath=/opt/apps/coolcollege/apiclient/apiclient_key.pem