陈威 / MarketBasedPricingProgram

Download as
Browse Code »

Commit e34e8ffd29823d1117e730275f946045073ce4cb

Authored by 陈威
1 parent f109bb9e
Exists in dev

1：添加日志信息

Showing 3 changed files with 25 additions and 79 deletions   Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
  Diff comments   View file @e34e8ff
... ... @@ -137,6 +137,7 @@ public class McVisitController extends BaseController {
137 137 @Log(title = "拜访工单-发布-一级审核", businessType = BusinessType.UPDATE)
138 138 @PostMapping("/ticket/submitAuditOne")
139 139 public AjaxResult ticketSubmitAuditOne(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException {
  140 + log.info("拜访工单-发布-一级审核，参数对象:{}", mcVisitAuditVo);
140 141 mcVisitAuditVo.setType("1");
141 142 mcVisitService.SubmitAudit(mcVisitAuditVo);
142 143 return AjaxResult.success();
... ... @@ -150,6 +151,7 @@ public class McVisitController extends BaseController {
150 151 @Log(title = "拜访工单-发布-二级审核", businessType = BusinessType.UPDATE)
151 152 @PostMapping("/ticket/submitAuditTwo")
152 153 public AjaxResult ticketsubmitAuditTwo(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException {
  154 + log.info("拜访工单-发布-二级审核，参数对象:{}", mcVisitAuditVo);
153 155 mcVisitAuditVo.setType("2");
154 156 mcVisitService.SubmitAudit(mcVisitAuditVo);
155 157 return AjaxResult.success();
... ... @@ -164,6 +166,7 @@ public class McVisitController extends BaseController {
164 166 @Log(title = "拜访工单-异动-一级审核", businessType = BusinessType.UPDATE)
165 167 @PostMapping("/modification/submitAuditOne")
166 168 public AjaxResult modificationSubmitAuditOne(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws Exception {
  169 + log.info("拜访工单-异动-一级审核，参数对象:{}", mcVisitAuditVo);
167 170 mcVisitAuditVo.setType("3");
168 171 mcVisitService.SubmitAudit(mcVisitAuditVo);
169 172 return AjaxResult.success();
... ... @@ -177,6 +180,7 @@ public class McVisitController extends BaseController {
177 180 @Log(title = "拜访工单-异动-二级审核", businessType = BusinessType.UPDATE)
178 181 @PostMapping("/modification/submitAuditTwo")
179 182 public AjaxResult modificationSubmitAuditTwo(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException {
  183 + log.info("拜访工单-异动-二级审核，参数对象:{}", mcVisitAuditVo);
180 184 mcVisitAuditVo.setType("4");
181 185 mcVisitService.SubmitAudit(mcVisitAuditVo);
182 186 return AjaxResult.success();
... ... @@ -194,6 +198,7 @@ public class McVisitController extends BaseController {
194 198 @Log(title = "拜访工单-发起异动", businessType = BusinessType.UPDATE)
195 199 @PostMapping("/modification")
196 200 public AjaxResult modification(@Validated @RequestBody McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException {
  201 + log.info("拜访工单-发起异动，参数对象:{}", mcVisitModificationVo);
197 202 return toAjax(mcVisitService.updateMcVisitModification(mcVisitModificationVo));
198 203 }
199 204  
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/test.java
View file @f109bb9
... ... @@ -1,73 +0,0 @@
1   -package com.chinagas.modules.schsf.controller;
2   -
3   -import com.chinagas.api.system.domain.SysDept;
4   -import com.chinagas.common.core.domain.AjaxResult;
5   -import org.springframework.web.bind.annotation.GetMapping;
6   -import org.springframework.web.bind.annotation.RequestMapping;
7   -import org.springframework.web.bind.annotation.RestController;
8   -
9   -import java.time.LocalDate;
10   -import java.time.Month;
11   -import java.time.format.DateTimeFormatter;
12   -
13   -@RestController
14   -@RequestMapping("/test")
15   -public class test {
16   - @GetMapping("/test1")
17   - public AjaxResult list1()
18   - {
19   - return AjaxResult.success("成功1");
20   - }
21   -
22   - @GetMapping
23   - public AjaxResult list2(SysDept dept)
24   - {
25   - return AjaxResult.success("成功2");
26   - }
27   -
28   -
29   -
30   -
31   - public static int determineFiscalYear(LocalDate date) {
32   - if (date.getMonth() == Month.APRIL || (date.getMonth().getValue() > Month.APRIL.getValue() && date.getYear() != 2100)) {
33   - return date.getYear();
34   - } else if (date.getMonth().getValue() < Month.APRIL.getValue()) {
35   - return date.getYear() - 1;
36   - } else {
37   - return date.getYear() + 1;
38   - }
39   - }
40   -
41   -
42   -
43   -
44   - public static void main(String[] args) {
45   -
46   -// LocalDate currentDate = LocalDate.now();
47   -// int currentFiscalYear = determineFiscalYear(currentDate);
48   -// System.out.println("当前日期的财年是: " + currentFiscalYear);
49   -
50   - DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
51   - String dateString = "2025-04-30";
52   - LocalDate date = LocalDate.parse(dateString, formatter);
53   - System.out.println("转换后的日期是: " + date);
54   -
55   - System.out.println("当前日期的财年是: " + determineFiscalYear(date));
56   -
57   -
58   -// for (int i = 0; i < 10; i++) {
59   -// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
60   -// AtomicInteger sequenceCounter = new AtomicInteger(0);
61   -// // 获取当前的日期和时间，并格式化为字符串
62   -// String timestamp = LocalDateTime.now().format(formatter);
63   -// // 生成并格式化六位自增序列号
64   -// int randomNum = ThreadLocalRandom.current().nextInt(1000000);
65   -// String sequencePart = String.format("%06d", randomNum);
66   -// // 合并时间戳和序列号以生成工单编号
67   -// String s = timestamp + sequencePart;
68   -// System.out.println(sequencePart);
69   -// }
70   - }
71   -
72   -
73   -}
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
  Diff comments   View file @e34e8ff
... ... @@ -218,6 +218,12 @@ public class McVisitServiceImpl implements IMcVisitService {
218 218 }
219 219 }
220 220  
  221 + /**
  222 + * 获取节点状态
  223 + * @param mcVisit
  224 + * @param event
  225 + * @return
  226 + */
221 227 private McVisit getStatusNodeInfo(McVisit mcVisit, VisitlsEventEnums event) {
222 228 VisitlsStatusNodeEnums visitlsStatusNodeEnums = StateMachineNext.getNext(mcVisit.getIsCharged(), event);
223 229 McVisitStatusNodeInfo info = visitlsStatusNodeEnums.getInfo();
... ... @@ -358,6 +364,7 @@ public class McVisitServiceImpl implements IMcVisitService {
358 364 String status = mcVisitAuditVo.getStatus();
359 365 String remarks = mcVisitAuditVo.getRemarks();
360 366 McVisit mcVisit = mcVisitMapper.selectMcVisitById(mcVisitAuditVo.getId());
  367 + log.info("拜访工单-审核，被审核对象:{}", mcVisit);
361 368 if (BeanUtil.isEmpty(mcVisit)) {
362 369 throw new RuntimeException("未查询到记录");
363 370 }
... ... @@ -377,7 +384,8 @@ public class McVisitServiceImpl implements IMcVisitService {
377 384 case "1":
378 385 //发布-一级审核
379 386 if (!mcVisit.getPublishStatus().equals(VisitPublishStatusEnums.PENDING_LEVEL_1_AUDIT.getCode())) {
380   - throw new RuntimeException("状态异常");
  387 + log.info("拜访工单-发布-一级审核，状态异常,被审核对象:{}", mcVisit);
  388 + throw new RuntimeException("状态异常,请刷新核对状态。");
381 389 }
382 390 visitlsEventEnums = status.equals(YesNoEnums.Y.getName()) ? VisitlsEventEnums.PUBLISH_1_AUDIT_YES : VisitlsEventEnums.PUBLISH_1_AUDIT_NO;
383 391 menuCode = "schsf:mcVisit:ticket_submitAuditOne";
... ... @@ -386,7 +394,8 @@ public class McVisitServiceImpl implements IMcVisitService {
386 394 break;
387 395 case "2":
388 396 if (!mcVisit.getPublishStatus().equals(VisitPublishStatusEnums.PENDING_LEVEL_2_AUDIT.getCode())) {
389   - throw new RuntimeException("状态异常");
  397 + log.info("拜访工单-发布-二级审核，状态异常,被审核对象:{}", mcVisit);
  398 + throw new RuntimeException("状态异常,请刷新核对状态。");
390 399 }
391 400 visitlsEventEnums = status.equals(YesNoEnums.Y.getName()) ? VisitlsEventEnums.PUBLISH_2_AUDIT_YES : VisitlsEventEnums.PUBLISH_2_AUDIT_NO;
392 401 menuCode = "schsf:mcVisit:ticket_submitAuditTwo";
... ... @@ -396,9 +405,10 @@ public class McVisitServiceImpl implements IMcVisitService {
396 405 procRole = "项目公司_财务";
397 406 break;
398 407 case "3":
399   - //发布-一级审核
  408 + //异动-一级审核
400 409 if (!mcVisit.getModificationStatus().equals(VisitModificationStatusEnums.PENDING_LEVEL_1_AUDIT.getCode())) {
401   - throw new RuntimeException("状态异常");
  410 + log.info("拜访工单-异动-一级审核，状态异常,被审核对象:{}", mcVisit);
  411 + throw new RuntimeException("状态异常,请刷新核对状态。");
402 412 }
403 413 visitlsEventEnums = status.equals(YesNoEnums.Y.getName()) ? VisitlsEventEnums.MODIFICATION_1_AUDIT_YES : VisitlsEventEnums.MODIFICATION_1_AUDIT_NO;
404 414 menuCode = "schsf:mcVisit:modification_submitAuditOne";
... ... @@ -407,9 +417,10 @@ public class McVisitServiceImpl implements IMcVisitService {
407 417 procRole = "项目公司_分管领导";
408 418 break;
409 419 case "4":
410   - //发布-一级审核
  420 + //异动-二级审核
411 421 if (!mcVisit.getModificationStatus().equals(VisitModificationStatusEnums.PENDING_LEVEL_2_AUDIT.getCode())) {
412   - throw new RuntimeException("状态异常");
  422 + log.info("拜访工单-异动-二级审核，状态异常,被审核对象:{}", mcVisit);
  423 + throw new RuntimeException("状态异常,请刷新核对状态。");
413 424 }
414 425 visitlsEventEnums = status.equals(YesNoEnums.Y.getName()) ? VisitlsEventEnums.MODIFICATION_2_AUDIT_YES : VisitlsEventEnums.MODIFICATION_2_AUDIT_NO;
415 426 menuCode = "schsf:mcVisit:modification_submitAuditTwo";
... ... @@ -421,6 +432,7 @@ public class McVisitServiceImpl implements IMcVisitService {
421 432 throw new RuntimeException("非法请求");
422 433 }
423 434 getStatusNodeInfo(mcVisit_new, visitlsEventEnums);
  435 + log.info("拜访工单-审核，被审核对象修改信息:{}", mcVisit_new);
424 436 mcVisitMapper.updateMcVisit(mcVisit_new);
425 437 iMcOperationLogService.insertMcOperationLog("mc_visit", mcVisit.getId(), menuCode,
426 438 status.equals("Y") ? "通过" : "驳回", opType, remarks, JSON.toJSONString(mcVisit), JSON.toJSONString(mcVisit_new));
... ... @@ -467,6 +479,7 @@ public class McVisitServiceImpl implements IMcVisitService {
467 479 @Override
468 480 public int updateMcVisitModification(McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException {
469 481 McVisit mcVisit_old = mcVisitMapper.selectMcVisitById(mcVisitModificationVo.getId());
  482 + log.info("拜访工单-发起异动，被异动对象:{}", mcVisit_old);
470 483 if (BeanUtil.isEmpty(mcVisit_old)) {
471 484 throw new RuntimeException("未查询到记录");
472 485 }
... ... @@ -497,6 +510,7 @@ public class McVisitServiceImpl implements IMcVisitService {
497 510 mcVisit_new.setAttachmentFile(mcVisitModificationVo.getAttachmentFile());
498 511 //收费验证
499 512 isChargedValidate(mcVisit_new);
  513 + log.info("拜访工单-发起异动，更新被异动对象信息:{}", mcVisit_new);
500 514 int i = mcVisitMapper.updateMcVisit(mcVisit_new);
501 515 if (i > 0) {
502 516 if (StringUtils.isNotEmpty(mcVisit_new.getFieldPhotoFile())) {
... ...