diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java index 1626389..73befda 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java @@ -137,6 +137,7 @@ public class McVisitController extends BaseController { @Log(title = "拜访工单-发布-一级审核", businessType = BusinessType.UPDATE) @PostMapping("/ticket/submitAuditOne") public AjaxResult ticketSubmitAuditOne(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { + log.info("拜访工单-发布-一级审核，参数对象:{}", mcVisitAuditVo); mcVisitAuditVo.setType("1"); mcVisitService.SubmitAudit(mcVisitAuditVo); return AjaxResult.success(); @@ -150,6 +151,7 @@ public class McVisitController extends BaseController { @Log(title = "拜访工单-发布-二级审核", businessType = BusinessType.UPDATE) @PostMapping("/ticket/submitAuditTwo") public AjaxResult ticketsubmitAuditTwo(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { + log.info("拜访工单-发布-二级审核，参数对象:{}", mcVisitAuditVo); mcVisitAuditVo.setType("2"); mcVisitService.SubmitAudit(mcVisitAuditVo); return AjaxResult.success(); @@ -164,6 +166,7 @@ public class McVisitController extends BaseController { @Log(title = "拜访工单-异动-一级审核", businessType = BusinessType.UPDATE) @PostMapping("/modification/submitAuditOne") public AjaxResult modificationSubmitAuditOne(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws Exception { + log.info("拜访工单-异动-一级审核，参数对象:{}", mcVisitAuditVo); mcVisitAuditVo.setType("3"); mcVisitService.SubmitAudit(mcVisitAuditVo); return AjaxResult.success(); @@ -177,6 +180,7 @@ public class McVisitController extends BaseController { @Log(title = "拜访工单-异动-二级审核", businessType = BusinessType.UPDATE) @PostMapping("/modification/submitAuditTwo") public AjaxResult modificationSubmitAuditTwo(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { + log.info("拜访工单-异动-二级审核，参数对象:{}", mcVisitAuditVo); mcVisitAuditVo.setType("4"); mcVisitService.SubmitAudit(mcVisitAuditVo); return AjaxResult.success(); @@ -194,6 +198,7 @@ public class McVisitController extends BaseController { @Log(title = "拜访工单-发起异动", businessType = BusinessType.UPDATE) @PostMapping("/modification") public AjaxResult modification(@Validated @RequestBody McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException { + log.info("拜访工单-发起异动，参数对象:{}", mcVisitModificationVo); return toAjax(mcVisitService.updateMcVisitModification(mcVisitModificationVo)); } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java deleted file mode 100644 index 1fbfb3c..0000000 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.chinagas.modules.schsf.controller; - -import com.chinagas.api.system.domain.SysDept; -import com.chinagas.common.core.domain.AjaxResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDate; -import java.time.Month; -import java.time.format.DateTimeFormatter; - -@RestController -@RequestMapping("/test") -public class test { - @GetMapping("/test1") - public AjaxResult list1() - { - return AjaxResult.success("成功1"); - } - - @GetMapping - public AjaxResult list2(SysDept dept) - { - return AjaxResult.success("成功2"); - } - - - - - public static int determineFiscalYear(LocalDate date) { - if (date.getMonth() == Month.APRIL || (date.getMonth().getValue() > Month.APRIL.getValue() && date.getYear() != 2100)) { - return date.getYear(); - } else if (date.getMonth().getValue() < Month.APRIL.getValue()) { - return date.getYear() - 1; - } else { - return date.getYear() + 1; - } - } - - - - - public static void main(String[] args) { - -// LocalDate currentDate = LocalDate.now(); -// int currentFiscalYear = determineFiscalYear(currentDate); -// System.out.println("当前日期的财年是: " + currentFiscalYear); - - DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE; - String dateString = "2025-04-30"; - LocalDate date = LocalDate.parse(dateString, formatter); - System.out.println("转换后的日期是: " + date); - - System.out.println("当前日期的财年是: " + determineFiscalYear(date)); - - -// for (int i = 0; i < 10; i++) { -// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); -// AtomicInteger sequenceCounter = new AtomicInteger(0); -// // 获取当前的日期和时间，并格式化为字符串 -// String timestamp = LocalDateTime.now().format(formatter); -// // 生成并格式化六位自增序列号 -// int randomNum = ThreadLocalRandom.current().nextInt(1000000); -// String sequencePart = String.format("%06d", randomNum); -// // 合并时间戳和序列号以生成工单编号 -// String s = timestamp + sequencePart; -// System.out.println(sequencePart); -// } - } - - -} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java index ad3d860..aa1b6ca 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java @@ -218,6 +218,12 @@ public class McVisitServiceImpl implements IMcVisitService { } } + /** + * 获取节点状态 + * @param mcVisit + * @param event + * @return + */ private McVisit getStatusNodeInfo(McVisit mcVisit, VisitlsEventEnums event) { VisitlsStatusNodeEnums visitlsStatusNodeEnums = StateMachineNext.getNext(mcVisit.getIsCharged(), event); McVisitStatusNodeInfo info = visitlsStatusNodeEnums.getInfo(); @@ -358,6 +364,7 @@ public class McVisitServiceImpl implements IMcVisitService { String status = mcVisitAuditVo.getStatus(); String remarks = mcVisitAuditVo.getRemarks(); McVisit mcVisit = mcVisitMapper.selectMcVisitById(mcVisitAuditVo.getId()); + log.info("拜访工单-审核，被审核对象:{}", mcVisit); if (BeanUtil.isEmpty(mcVisit)) { throw new RuntimeException("未查询到记录"); } @@ -377,7 +384,8 @@ public class McVisitServiceImpl implements IMcVisitService { case "1": //发布-一级审核 if (!mcVisit.getPublishStatus().equals(VisitPublishStatusEnums.PENDING_LEVEL_1_AUDIT.getCode())) { - throw new RuntimeException("状态异常"); + log.info("拜访工单-发布-一级审核，状态异常,被审核对象:{}", mcVisit); + throw new RuntimeException("状态异常,请刷新核对状态。"); } visitlsEventEnums = status.equals(YesNoEnums.Y.getName()) ? VisitlsEventEnums.PUBLISH_1_AUDIT_YES : VisitlsEventEnums.PUBLISH_1_AUDIT_NO; menuCode = "schsf:mcVisit:ticket_submitAuditOne"; @@ -386,7 +394,8 @@ public class McVisitServiceImpl implements IMcVisitService { break; case "2": if (!mcVisit.getPublishStatus().equals(VisitPublishStatusEnums.PENDING_LEVEL_2_AUDIT.getCode())) { - throw new RuntimeException("状态异常"); + log.info("拜访工单-发布-二级审核，状态异常,被审核对象:{}", mcVisit); + throw new RuntimeException("状态异常,请刷新核对状态。"); } visitlsEventEnums = status.equals(YesNoEnums.Y.getName()) ? VisitlsEventEnums.PUBLISH_2_AUDIT_YES : VisitlsEventEnums.PUBLISH_2_AUDIT_NO; menuCode = "schsf:mcVisit:ticket_submitAuditTwo"; @@ -396,9 +405,10 @@ public class McVisitServiceImpl implements IMcVisitService { procRole = "项目公司_财务"; break; case "3": - //发布-一级审核 + //异动-一级审核 if (!mcVisit.getModificationStatus().equals(VisitModificationStatusEnums.PENDING_LEVEL_1_AUDIT.getCode())) { - throw new RuntimeException("状态异常"); + log.info("拜访工单-异动-一级审核，状态异常,被审核对象:{}", mcVisit); + throw new RuntimeException("状态异常,请刷新核对状态。"); } visitlsEventEnums = status.equals(YesNoEnums.Y.getName()) ? VisitlsEventEnums.MODIFICATION_1_AUDIT_YES : VisitlsEventEnums.MODIFICATION_1_AUDIT_NO; menuCode = "schsf:mcVisit:modification_submitAuditOne"; @@ -407,9 +417,10 @@ public class McVisitServiceImpl implements IMcVisitService { procRole = "项目公司_分管领导"; break; case "4": - //发布-一级审核 + //异动-二级审核 if (!mcVisit.getModificationStatus().equals(VisitModificationStatusEnums.PENDING_LEVEL_2_AUDIT.getCode())) { - throw new RuntimeException("状态异常"); + log.info("拜访工单-异动-二级审核，状态异常,被审核对象:{}", mcVisit); + throw new RuntimeException("状态异常,请刷新核对状态。"); } visitlsEventEnums = status.equals(YesNoEnums.Y.getName()) ? VisitlsEventEnums.MODIFICATION_2_AUDIT_YES : VisitlsEventEnums.MODIFICATION_2_AUDIT_NO; menuCode = "schsf:mcVisit:modification_submitAuditTwo"; @@ -421,6 +432,7 @@ public class McVisitServiceImpl implements IMcVisitService { throw new RuntimeException("非法请求"); } getStatusNodeInfo(mcVisit_new, visitlsEventEnums); + log.info("拜访工单-审核，被审核对象修改信息:{}", mcVisit_new); mcVisitMapper.updateMcVisit(mcVisit_new); iMcOperationLogService.insertMcOperationLog("mc_visit", mcVisit.getId(), menuCode, status.equals("Y") ? "通过" : "驳回", opType, remarks, JSON.toJSONString(mcVisit), JSON.toJSONString(mcVisit_new)); @@ -467,6 +479,7 @@ public class McVisitServiceImpl implements IMcVisitService { @Override public int updateMcVisitModification(McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException { McVisit mcVisit_old = mcVisitMapper.selectMcVisitById(mcVisitModificationVo.getId()); + log.info("拜访工单-发起异动，被异动对象:{}", mcVisit_old); if (BeanUtil.isEmpty(mcVisit_old)) { throw new RuntimeException("未查询到记录"); } @@ -497,6 +510,7 @@ public class McVisitServiceImpl implements IMcVisitService { mcVisit_new.setAttachmentFile(mcVisitModificationVo.getAttachmentFile()); //收费验证 isChargedValidate(mcVisit_new); + log.info("拜访工单-发起异动，更新被异动对象信息:{}", mcVisit_new); int i = mcVisitMapper.updateMcVisit(mcVisit_new); if (i > 0) { if (StringUtils.isNotEmpty(mcVisit_new.getFieldPhotoFile())) { -- libgit2 0.21.2