youxiw2000 / trash · Commits

Commit 169cdb34d751129cf1ab3596df4e892ee07f0009

Authored by youxiw2000
1 parent e35083c5
build: skipped

m

Inline Side-by-side
Showing 5 changed files with 74 additions and 11 deletions
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @169cdb3
... ... @@ -425,14 +425,14 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
425 425 }
426 426  
427 427 map.put("status", "开工");
428   - map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
  428 + map.put("selfCheckTime", dateTime.format(s.getCheckTime()));
429 429 map.put("objectId", s.getObjectId());
430 430 map.put("type", "");
431 431 map.put("eid", e.getObjectId());
432 432 map.put("ename", e.getName());
433 433 map.put("eplace", e.getPlace());
434 434 map.put("estatus", "开工");
435   - map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
  435 + map.put("eselfCheckTime", dateTime.format(e.getCheckTime()));
436 436 map.put("etype", "");
437 437  
438 438 map.put("descript", "有效开工");
... ... @@ -483,14 +483,14 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
483 483 }
484 484 }
485 485 map.put("status", "开工");
486   - map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
  486 + map.put("selfCheckTime", dateTime.format(s.getCheckTime()));
487 487 map.put("objectId", s.getObjectId());
488 488 map.put("type", "");
489 489 map.put("eid", e.getObjectId());
490 490 map.put("ename", e.getName());
491 491 map.put("eplace", e.getPlace());
492 492 map.put("estatus", "开工");
493   - map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
  493 + map.put("eselfCheckTime", dateTime.format(e.getCheckTime()));
494 494 map.put("etype", "");
495 495  
496 496 map.put("descript", "有效开工");
... ... @@ -500,9 +500,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
500 500 }
501 501 }
502 502 }
503   -
504 503 }
505   -
506 504 }
507 505  
508 506  
... ...
trash-workFlow/src/main/java/com/trash/caseOffline/controller/CaseOfflineController.java
  View file @169cdb3
... ... @@ -76,14 +76,16 @@ public class CaseOfflineController extends BaseController
76 76 break;
77 77 }
78 78 }
79   - if (list.get(i).advice4 != null) {
  79 + if (list.get(i).getStatus() == 1) {
80 80 list.get(i).status1 = "结案存档";
81   - }else if (list.get(i).advice1 == null) {
82   - list.get(i).status1 = "未回复";
83   - }else if (list.get(i).advice4 == null && list.get(i).advice3 == null) {
  81 + }else if (list.get(i).getStatus() == 2) {
  82 + list.get(i).status1 = "被驳回";
  83 + }else if (list.get(i).status1 != null && Integer.parseInt(list.get(i).status1) == 1) {
84 84 list.get(i).status1 = "已回复";
85   - }else if (list.get(i).advice4 == null && list.get(i).advice3 != null) {
  85 + }else if (list.get(i).status1 != null && Integer.parseInt(list.get(i).status1) > 1) {
86 86 list.get(i).status1 = "审核中";
  87 + }else{
  88 + list.get(i).status1 = "未回复";
87 89 }
88 90  
89 91 }
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @169cdb3
... ... @@ -585,6 +585,10 @@ public class WorkflowServiceImpl implements IWorkflowService {
585 585  
586 586 SysUser user = SecurityUtils.getLoginUser().getUser();
587 587 awf = insertAwf(user, workflow);
  588 +
  589 +
  590 + sendSMS(caseFile);
  591 +
588 592 return workflowMapper.insertWorkflow(workflow);
589 593 } catch (Exception e) {
590 594 e.printStackTrace();
... ... @@ -595,6 +599,59 @@ public class WorkflowServiceImpl implements IWorkflowService {
595 599 }
596 600 }
597 601  
  602 + private void sendSMS(ViolationCaseFile caseFile) {
  603 +// String token = SecurityUtils.getLoginUser().getToken();
  604 +//
  605 +// new Thread(new Runnable() {
  606 +//
  607 +// @Override
  608 +// public void run() {
  609 +//
  610 +// List<Mobile> mobileList = new ArrayList<Mobile>();
  611 +//
  612 +// String number = actMapper.getPhoneNumber(processInstance.getProcessDefinitionKey(), task.getName());
  613 +//
  614 +// if (number != null) {
  615 +// String smsString = "工作提醒：您有新的工作流程，请及时处理。";
  616 +// Mobile mobile = new Mobile();
  617 +// mobile.setMobile(number);
  618 +// mobileList.add(mobile);
  619 +//
  620 +// if (processInstance.getProcessDefinitionKey().equals("workflow_constructsite")) {
  621 +//
  622 +// JSONObject json = RemoteServerUtils
  623 +// .getConstructionInfo(processInstance.getBusinessKey().split(":")[1], token);
  624 +// if (json != null)
  625 +// smsString = "审批提醒：您有新的工作流程需要审批 " + json.getString("areaCodeName") + " "
  626 +// + json.getString("name");
  627 +//
  628 +// }
  629 +//
  630 +// if (processInstance.getProcessDefinitionKey().equals("workflow_caseoffline")) {
  631 +//
  632 +// String dname = actMapper.getCaseTypeName("case_offline_type",
  633 +// processInstance.getBusinessKey().split(":")[1]);
  634 +// smsString = "案卷提醒：有一条" + dname + "的案卷，请及时处理。";
  635 +// }
  636 +//
  637 +// JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
  638 +// if (jsonSmsSend != null) {
  639 +// if (jsonSmsSend.getState() == 0) {
  640 +// System.out.println("发送成功");
  641 +// } else {
  642 +// System.out.println(jsonSmsSend.getMessage());
  643 +// }
  644 +// } else {
  645 +// System.out.println("发送返回空");
  646 +// }
  647 +// }
  648 +//
  649 +// }
  650 +//
  651 +// }).start();
  652 +
  653 + }
  654 +
598 655 @Override
599 656 @Transactional
600 657 public int createCaseFile1(ViolationWarningInformation caseFile, int index, int isAuto) { // 违规预警案卷
... ...
trash-workFlow/src/main/resources/mapper/ConstructionCreditMapper.xml
  View file @169cdb3
... ... @@ -14,6 +14,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
14 14 <result property="status" column="status" />
15 15 <result property="lostCredit" column="lost_credit" />
16 16 <result property="objectId" column="object_id" />
  17 + <result property="createBy" column="create_by" />
17 18 </resultMap>
18 19  
19 20 <sql id="selectConstructionCreditVo">
... ... @@ -57,6 +58,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
57 58 <if test="status != null">status,</if>
58 59 <if test="lostCredit != null">lost_credit,</if>
59 60 <if test="objectId != null ">object_id,</if>
  61 + <if test="createBy != null ">create_by,</if>
60 62 </trim>
61 63 <trim prefix="values (" suffix=")" suffixOverrides=",">
62 64 <if test="name != null">#{name},</if>
... ... @@ -67,6 +69,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
67 69 <if test="status != null">#{status},</if>
68 70 <if test="lostCredit != null">#{lostCredit},</if>
69 71 <if test="objectId != null ">#{objectId},</if>
  72 + <if test="createBy != null ">#{createBy},</if>
70 73 </trim>
71 74 </insert>
72 75  
... ...
trash-workFlow/src/main/resources/mapper/EarthsitesCreditMapper.xml
  View file @169cdb3
... ... @@ -14,6 +14,7 @@
14 14 <result property="status" column="status" />
15 15 <result property="lostCredit" column="lost_credit" />
16 16 <result property="objectId" column="object_id" />
  17 + <result property="createBy" column="create_by" />
17 18 </resultMap>
18 19  
19 20 <sql id="selectEarthsitesCreditVo">
... ... @@ -57,6 +58,7 @@
57 58 <if test="status != null">status,</if>
58 59 <if test="lostCredit != null">lost_credit,</if>
59 60 <if test="objectId != null">object_id,</if>
  61 + <if test="createBy != null ">create_by,</if>
60 62 </trim>
61 63 <trim prefix="values (" suffix=")" suffixOverrides=",">
62 64 <if test="name != null">#{name},</if>
... ... @@ -67,6 +69,7 @@
67 69 <if test="status != null">#{status},</if>
68 70 <if test="lostCredit != null">#{lostCredit},</if>
69 71 <if test="objectId != null">#{objectId},</if>
  72 + <if test="createBy != null ">#{createBy},</if>
70 73 </trim>
71 74 </insert>
72 75  
... ...