Browse Source

feat: 测试调整

master
Yen 8 months ago
parent
commit
66e1f6226c
  1. 7
      src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java
  2. 24
      src/main/java/com/qs/serve/modules/visit/controller/VisitMainController.java
  3. 13
      src/main/java/com/qs/serve/modules/visit/service/impl/VisitMainServiceImpl.java
  4. 3
      src/main/resources/application-dev.yml

7
src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java

@ -201,7 +201,10 @@ public class VisitMainOuterApi {
entity.setVisitorCompany(param.getVisitorCompany()); entity.setVisitorCompany(param.getVisitorCompany());
entity.setVisitorCar(param.getVisitorCar()); entity.setVisitorCar(param.getVisitorCar());
entity.setVisitorEmail(param.getVisitorEmail()); entity.setVisitorEmail(param.getVisitorEmail());
// 主题相关
entity.setThemeId(visitTheme.getId()); entity.setThemeId(visitTheme.getId());
entity.setVisitStartDate(visitTheme.getVisitStartDate());
entity.setVisitEndDate(visitTheme.getVisitEndDate());
//其它 //其它
entity.setId(null); entity.setId(null);
entity.setVisitCode(CodeGenUtil.getDataCode(CodeGenUtil.SourceDataKey.VISIT)); entity.setVisitCode(CodeGenUtil.getDataCode(CodeGenUtil.SourceDataKey.VISIT));
@ -223,7 +226,9 @@ public class VisitMainOuterApi {
visitMainService.doFinish(entity.getId(),null); visitMainService.doFinish(entity.getId(),null);
}else { }else {
// 申请审批 // 申请审批
visitMainService.submitOaFlow(entity.getId()); if(1==2){
visitMainService.submitOaFlow(entity.getId());
}
} }
return R.ok(param.getId()); return R.ok(param.getId());
} }

24
src/main/java/com/qs/serve/modules/visit/controller/VisitMainController.java

@ -51,19 +51,6 @@ public class VisitMainController {
lqw.orderByDesc(VisitMain::getCreateTime); lqw.orderByDesc(VisitMain::getCreateTime);
PageUtil.startPage(); PageUtil.startPage();
List<VisitMain> list = visitMainService.list(lqw); List<VisitMain> list = visitMainService.list(lqw);
for (VisitMain visit : list) {
// 仅审批中数据进行补偿
if(visit.getCheckState().equals(VisitMainConst.CheckState_0)){
try {
VisitTheme visitTheme = visitThemeService.getById(visit.getThemeId());
if(visitTheme.getSkipApprovalFlag()==null || !visitTheme.getSkipApprovalFlag().equals(1)){
visitMainService.runCompensate(visit.getId());
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
return R.byPageHelperList(list); return R.byPageHelperList(list);
} }
@ -90,6 +77,17 @@ public class VisitMainController {
@SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.QUERY) @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.QUERY)
public R<VisitMainVo> getById(@PathVariable("id") String id){ public R<VisitMainVo> getById(@PathVariable("id") String id){
VisitMainVo visitMain = visitMainService.getDetail(id); VisitMainVo visitMain = visitMainService.getDetail(id);
// 仅审批中数据进行补偿
if(visitMain.getCheckState().equals(VisitMainConst.CheckState_0)){
try {
VisitTheme visitTheme = visitThemeService.getById(visitMain.getThemeId());
if(visitTheme.getSkipApprovalFlag()==null || !visitTheme.getSkipApprovalFlag().equals(1)){
visitMainService.runCompensate(visitMain.getId());
}
} catch (Exception e) {
e.printStackTrace();
}
}
return R.ok(visitMain); return R.ok(visitMain);
} }

13
src/main/java/com/qs/serve/modules/visit/service/impl/VisitMainServiceImpl.java

@ -9,7 +9,9 @@ import com.qs.serve.common.model.oa.BaseCreateCallbackBo;
import com.qs.serve.common.model.oa.OaFormMainProcess; import com.qs.serve.common.model.oa.OaFormMainProcess;
import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.Assert;
import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.CopierUtil;
import com.qs.serve.common.util.DateUtils;
import com.qs.serve.common.util.TianYiYunSmsUtil; import com.qs.serve.common.util.TianYiYunSmsUtil;
import com.qs.serve.common.util.model.DateFormatString;
import com.qs.serve.modules.flow.model.TbsAffairCommitBo; import com.qs.serve.modules.flow.model.TbsAffairCommitBo;
import com.qs.serve.modules.flow.service.SeeYonOptionService; import com.qs.serve.modules.flow.service.SeeYonOptionService;
import com.qs.serve.modules.flow.service.SeeYonService; import com.qs.serve.modules.flow.service.SeeYonService;
@ -95,18 +97,21 @@ public class VisitMainServiceImpl extends ServiceImpl<VisitMainMapper,VisitMain>
mainData.put("themeCode",visitTheme.getThemeCode()); mainData.put("themeCode",visitTheme.getThemeCode());
mainData.put("themeTitle",visitTheme.getThemeTitle()); mainData.put("themeTitle",visitTheme.getThemeTitle());
mainData.put("visitCOde",visitMain.getVisitCode());
mainData.put("visitCode",visitMain.getVisitCode()); mainData.put("visitCode",visitMain.getVisitCode());
mainData.put("deptName",visitMain.getDeptName()); mainData.put("deptName",visitMain.getDeptName());
mainData.put("userCode",visitMain.getUserCode()); mainData.put("userCode",visitMain.getUserCode());
mainData.put("userName",visitMain.getUserName()); mainData.put("userName",visitMain.getUserName());
mainData.put("userRoom",visitMain.getUserRoom()); mainData.put("userRoom",visitMain.getUserRoom());
mainData.put("preVisitDate",visitMain.getPreVisitDate()); mainData.put("preVisitDate",visitMain.getPreVisitDate());
mainData.put("submitTime",visitMain.getSubmitTime()); mainData.put("submitTime",DateUtils.format(visitMain.getSubmitTime(), DateFormatString.DATE_TIME));
mainData.put("visitorCompany",visitMain.getVisitorCompany()); mainData.put("visitorCompany",visitMain.getVisitorCompany());
mainData.put("visitorIdentity",visitMain.getVisitorIdentity()); mainData.put("visitorIdentity",visitMain.getVisitorIdentity());
mainData.put("visitStartDate",visitMain.getVisitStartDate()); if(visitMain.getVisitStartDate()!=null){
mainData.put("visitEndDate",visitMain.getVisitEndDate()); mainData.put("visitStartDate",DateUtils.format(visitMain.getVisitStartDate(), DateFormatString.DATE_TIME));
}
if (visitMain.getVisitEndDate()!=null){
mainData.put("visitEndDate", DateUtils.format(visitMain.getVisitEndDate(), DateFormatString.DATE_TIME));
}
mainData.put("visitorName",visitMain.getVisitorName()); mainData.put("visitorName",visitMain.getVisitorName());
mainData.put("visitorMobile",visitMain.getVisitorMobile()); mainData.put("visitorMobile",visitMain.getVisitorMobile());
mainData.put("visitorCart",visitMain.getVisitorCar()); mainData.put("visitorCart",visitMain.getVisitorCar());

3
src/main/resources/application-dev.yml

@ -1,5 +1,6 @@
#项目配置 #项目配置
project: project:
h5visitMainUrl: 'http://192.168.0.9:7350/h5-dev/#/visit-item-check-qrcode?id='
flowTest: true flowTest: true
upload: upload:
#上传映射地址 #上传映射地址
@ -7,7 +8,7 @@ project:
apis: apis:
host: host:
seeyon: 'http://127.0.0.1:7444' seeyon: 'http://127.0.0.1:7445'
aliyun: aliyun:
oss: oss:

Loading…
Cancel
Save