m

youxiw2000
1 parent e35083c5
Showing 5 changed files with 74 additions and 11 deletions
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/caseOffline/controller/CaseOfflineController.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
trash-workFlow/src/main/resources/mapper/ConstructionCreditMapper.xml
trash-workFlow/src/main/resources/mapper/EarthsitesCreditMapper.xml
@@ -425,14 +425,14 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 							}
 							map.put("status", "开工");
-							map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
+							map.put("selfCheckTime", dateTime.format(s.getCheckTime()));
 							map.put("objectId", s.getObjectId());
 							map.put("type", "");
 							map.put("eid", e.getObjectId());
 							map.put("ename", e.getName());
 							map.put("eplace", e.getPlace());
 							map.put("estatus", "开工");
-							map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
+							map.put("eselfCheckTime", dateTime.format(e.getCheckTime()));
 							map.put("etype", "");
 							map.put("descript", "有效开工");
@@ -483,14 +483,14 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 									}
 								}
 								map.put("status", "开工");
-								map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
+								map.put("selfCheckTime", dateTime.format(s.getCheckTime()));
 								map.put("objectId", s.getObjectId());
 								map.put("type", "");
 								map.put("eid", e.getObjectId());
 								map.put("ename", e.getName());
 								map.put("eplace", e.getPlace());
 								map.put("estatus", "开工");
-								map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
+								map.put("eselfCheckTime", dateTime.format(e.getCheckTime()));
 								map.put("etype", "");
 								map.put("descript", "有效开工");
@@ -500,9 +500,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 						}
 					}
 				}
-
 			}
-
 		}
@@ -76,14 +76,16 @@ public class CaseOfflineController extends BaseController
         			break;
         		}
         	}
-        	if (list.get(i).advice4 != null) {
+        	if (list.get(i).getStatus() == 1) {
         		list.get(i).status1 = "结案存档";
-    		}else if (list.get(i).advice1 == null) {
-    			list.get(i).status1 =  "未回复";
-    		}else if (list.get(i).advice4 == null && list.get(i).advice3 == null) {
+    		}else if (list.get(i).getStatus() == 2) {
+        		list.get(i).status1 = "被驳回";
+    		}else if (list.get(i).status1 != null && Integer.parseInt(list.get(i).status1) == 1) {
     			list.get(i).status1 =  "已回复";
-    		}else if (list.get(i).advice4 == null && list.get(i).advice3 != null) {
+    		}else if (list.get(i).status1 != null && Integer.parseInt(list.get(i).status1) > 1) {
     			list.get(i).status1 =  "审核中";
+    		}else{
+    			list.get(i).status1 =  "未回复";
     		}
         }
@@ -585,6 +585,10 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			SysUser user = SecurityUtils.getLoginUser().getUser();
 			awf = insertAwf(user, workflow);
+			
+			
+			sendSMS(caseFile);
+			
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -595,6 +599,59 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		}
 	}
+	private void sendSMS(ViolationCaseFile caseFile) {
+//		String token = SecurityUtils.getLoginUser().getToken();
+//
+//		new Thread(new Runnable() {
+//
+//			@Override
+//			public void run() {
+//
+//				List<Mobile> mobileList = new ArrayList<Mobile>();
+//
+//				String number = actMapper.getPhoneNumber(processInstance.getProcessDefinitionKey(), task.getName());
+//
+//				if (number != null) {
+//					String smsString = "工作提醒：您有新的工作流程，请及时处理。";
+//					Mobile mobile = new Mobile();
+//					mobile.setMobile(number);
+//					mobileList.add(mobile);
+//
+//					if (processInstance.getProcessDefinitionKey().equals("workflow_constructsite")) {
+//
+//						JSONObject json = RemoteServerUtils
+//								.getConstructionInfo(processInstance.getBusinessKey().split(":")[1], token);
+//						if (json != null)
+//							smsString = "审批提醒：您有新的工作流程需要审批 " + json.getString("areaCodeName") + " "
+//									+ json.getString("name");
+//
+//					}
+//
+//					if (processInstance.getProcessDefinitionKey().equals("workflow_caseoffline")) {
+//
+//						String dname = actMapper.getCaseTypeName("case_offline_type",
+//								processInstance.getBusinessKey().split(":")[1]);
+//						smsString = "案卷提醒：有一条" + dname + "的案卷，请及时处理。";
+//					}
+//
+//					JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
+//					if (jsonSmsSend != null) {
+//						if (jsonSmsSend.getState() == 0) {
+//							System.out.println("发送成功");
+//						} else {
+//							System.out.println(jsonSmsSend.getMessage());
+//						}
+//					} else {
+//						System.out.println("发送返回空");
+//					}
+//				}
+//
+//			}
+//
+//		}).start();
+		
+	}
+
 	@Override
 	@Transactional
 	public int createCaseFile1(ViolationWarningInformation caseFile, int index, int isAuto) { // 违规预警案卷
@@ -14,6 +14,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="status"    column="status"    />
         <result property="lostCredit"    column="lost_credit"    />
         <result property="objectId"    column="object_id"    />
+        <result property="createBy"    column="create_by"    />
     </resultMap>
     <sql id="selectConstructionCreditVo">
@@ -57,6 +58,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="status != null">status,</if>
             <if test="lostCredit != null">lost_credit,</if>
             <if test="objectId != null ">object_id,</if>
+            <if test="createBy != null ">create_by,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -67,6 +69,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="status != null">#{status},</if>
             <if test="lostCredit != null">#{lostCredit},</if>
             <if test="objectId != null ">#{objectId},</if>
+            <if test="createBy != null ">#{createBy},</if>
          </trim>
     </insert>
@@ -14,6 +14,7 @@
         <result property="status"    column="status"    />
         <result property="lostCredit"    column="lost_credit"    />
         <result property="objectId"    column="object_id"    />
+        <result property="createBy"    column="create_by"    />
     </resultMap>
     <sql id="selectEarthsitesCreditVo">
@@ -57,6 +58,7 @@
             <if test="status != null">status,</if>
             <if test="lostCredit != null">lost_credit,</if>
             <if test="objectId != null">object_id,</if>
+            <if test="createBy != null ">create_by,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -67,6 +69,7 @@
             <if test="status != null">#{status},</if>
             <if test="lostCredit != null">#{lostCredit},</if>
             <if test="objectId != null">#{objectId},</if>
+            <if test="createBy != null ">#{createBy},</if>
         </trim>
     </insert>