存量用地修改 简易流程修改

src/main/java/platform/common/Constant.java

@@ -346,21 +346,25 @@ public final class Constant {
     public static final class LandApproveStatus {
         //存量用地审核状态1：属地初审，2 : 待分发，3：合规性审查，4：联合评议，5：二次联合评议，6：区政府审核，7：退回，8：通过（手续办理），9：不通过，10:简易流程通过11：合规性审查汇总 12：通过（手续办理通过）,13: 通过（手续办理不通过）,14：简易流程会签，15：简易流程汇总
         public static String LOCAL_AUDIT = "1"; //属地初审
-        public static String PENDING_DISTRIBUTE = "2"; //待分发
+        public static String PENDING_DISTRIBUTE = "2"; //待分发s
         public static String COMPLIANCE_AUDIT = "3"; //合规性审查
         public static String UNITED_AUDIT = "4"; //联合评议
         public static String TWICE_UNITED_AUDIT = "5"; //二次联合评议
         public static String GOVERNMENT_AUDIT = "6"; //区政府审核
         public static String REJECT = "7"; //退回
-        public static String APPROVED = "8"; //通过（手续办理）
+        public static String APPROVED = "8"; //通过（手续办理） 基本最终状态都是这种数据
         public static String NOTAPPROVED = "9"; //不通过
-        public static String JYLCAPPROVAL = "10"; //简易流程通过
+//        public static String JYLCAPPROVAL = "10"; //简易流程通过
         public static String HGXSCTG = "11"; //合规性审查汇总
-        public static String PASSED = "12"; //通过（手续办理通过）
-        public static String NOTPASSED = "13"; //通过（手续办理不通过）
+        public static String PASSED = "12"; //通过（手续办理通过） 这种状态只有一条数据
+        public static String NOTPASSED = "13"; //通过（手续办理不通过） 这种状态没有数据
 
+        // 2020-01-10 wj 简易流程会签 改为 简易流程办理中
         public static String JYLCHQ = "14"; //简易流程会签
         public static String JYLCHZ = "15"; //简易流程汇总
+        // 2020-01-14 wj 简易流程结果
+        public static String EASY_PROCESS_APPROVED = "80"; // 简易流程通过
+        public static String EASY_PROCESS_DENY = "90"; // 简易流程不通过
 
     }
 

src/main/java/platform/modules/company/service/StockLandApproveService.java

@@ -7,6 +7,8 @@ import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +61,8 @@ import java.util.*;
 @Service
 @Transactional
 public class StockLandApproveService extends BaseService<StockLand> {
+
+	private static final Logger logger = LoggerFactory.getLogger(StockLandApproveService.class);
     
 	@Autowired
 	private StockLandService stockLandService;
@@ -115,7 +119,7 @@ public class StockLandApproveService extends BaseService<StockLand> {
      */
     @Transactional(readOnly = true)
     public PageInfo<StockLand> findPage(Integer pageNum, Integer pageSize, String param,StockLand searchCondition) throws Exception {
-        Approval approvalCondition = new Approval();
+	        Approval approvalCondition = new Approval();
         approvalCondition.setNextchecker(String.valueOf(ShiroUtils.getUserId()));
         approvalCondition.setType(Constant.DictionaryType.STOCKLAND);
     	FindRequest request = new FindRequest();
@@ -626,17 +630,20 @@ public class StockLandApproveService extends BaseService<StockLand> {
 //				apply.setApply_status(Constant.LandApplyStatus.NOTAPPROVED);
 //			}
 
-			if(Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.REJECT)) {
+			if (Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.REJECT)) {
 				apply.setApply_status(Constant.LandApplyStatus.REJECT);
-			}else if(Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.APPROVED)) {
+			} else if (Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.APPROVED)
+					  || Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.EASY_PROCESS_APPROVED)) {
 				apply.setApply_status(Constant.LandApplyStatus.APPROVED);
 				apply.setProcess_status(Constant.ProcessStatus.IN_PROGRESS);
-			}else if(Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.NOTAPPROVED)) {
+			}else if (Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.NOTAPPROVED)
+				     || Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.EASY_PROCESS_DENY)) {
 				apply.setApply_status(Constant.LandApplyStatus.NOTAPPROVED);
 			} else {
-				throw new RuntimeException("单据的状态错误");
+				logger.error("单据的状态:{}", apply.getApprove_status());
+				throw new RuntimeException("错误的单据状态：" + apply.getApprove_status());
 			}
-			
+
 			stockLandService.updateSelective(apply);
 			//置空临时状态
 			stockLandService.updateTempporaryStateToNull(apply.getId());
@@ -663,7 +670,7 @@ public class StockLandApproveService extends BaseService<StockLand> {
 		}
 		return false;
 	}
-    
+
 	public Boolean sendMsg(Message message) {
 		StockLand apply = stockLandService.findById(message.getApply_id());
 		//发送短信通知企业
@@ -737,21 +744,37 @@ public class StockLandApproveService extends BaseService<StockLand> {
 	public Boolean isPendingNotify(StockLand apply) {
 		String approveStatus = apply.getApprove_status();
 		String applyStatus = apply.getApply_status();
-		if(approveStatus.equals(Constant.LandApproveStatus.APPROVED) && !applyStatus.equals(Constant.LandApplyStatus.APPROVED)) {
+		if ( isApprovalStatusApproved(approveStatus)
+                && !applyStatus.equals(Constant.LandApplyStatus.APPROVED)) {
 			return true;
-		}else if(approveStatus.equals(Constant.LandApproveStatus.NOTAPPROVED) && !applyStatus.equals(Constant.LandApplyStatus.NOTAPPROVED)) {
+		}
+		if(approveStatus.equals(Constant.LandApproveStatus.NOTAPPROVED)
+				&& !applyStatus.equals(Constant.LandApplyStatus.NOTAPPROVED)) {
 			return true;
-		}else if(approveStatus.equals(Constant.LandApproveStatus.REJECT) && !applyStatus.equals(Constant.LandApplyStatus.REJECT)) {
+		}
+		if( isApprovalStatusRejected(approveStatus)
+				&& !applyStatus.equals(Constant.LandApplyStatus.REJECT)) {
 			return true;
 		}
+
 		String temporary_state = apply.getTemporary_state();
 		if(StringUtils.isNotBlank(temporary_state)){
 			return true;
 		}
 		return false;
 	}
-	
-	//是否待审批状态
+
+	private boolean isApprovalStatusRejected(String approveStatus) {
+		return approveStatus.equals(Constant.LandApproveStatus.REJECT)
+				|| approveStatus.equals(Constant.LandApproveStatus.EASY_PROCESS_DENY);
+	}
+
+	private boolean isApprovalStatusApproved(String approveStatus) {
+        return approveStatus.equals(Constant.LandApproveStatus.APPROVED)
+                || approveStatus.equals(Constant.LandApproveStatus.EASY_PROCESS_APPROVED);
+    }
+
+    //是否待审批状态
 	public Boolean isPendingAudit(StockLand apply) {
 		String approveStatus = apply.getApprove_status();
 		if(approveStatus.equals(Constant.LandApproveStatus.APPROVED)||approveStatus.equals(Constant.LandApproveStatus.NOTAPPROVED)

src/main/resources/application.yml

@@ -15,12 +15,12 @@ spring:
   #激活哪一个环境的配置文件
   profiles:
 
-#    active: dev
+    active: dev
 #    active: test
 #    active: aliyun
 #    active: vpn
 #    active: prod_in
-    active: prod_out
+#    active: prod_out
 #    active: prod_test
 
   #数据源
@@ -129,16 +129,17 @@ pagehelper:
 
 
 #测试小程序
-#app_id
+##app_id
 #app_id: wx3007d6086b29908c
-
-#app_sercet
+#
+##app_sercet
 #app_sercet: 68245dbd037f7516bcbe0eeafc1e01a9
 
 # 正式小程序
-##app_id
+#app_id
 app_id: wx27a06edbe6042585
-##app_sercet
+
+#app_sercet
 app_sercet: 10a09d22fb48ba84f892bbde056dac06
 
 activity_page_path_detail: pages/activity/activityDetail/main
@@ -156,7 +157,7 @@ spring:
   profiles: dev
   #数据源
   datasource:
-    url: jdbc:mysql://192.168.1.115:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://222.92.16.3:33061/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
   #redis
@@ -255,7 +256,7 @@ spring:
   profiles: aliyun
   #数据源
   datasource:
-    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://47.105.241.108:33060/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
   #redis
@@ -388,7 +389,7 @@ repositoryPath: /opt/xinqu_pic
 api_url: http://snd.ideatob.com/mp/api/
 
 #访问路径
-fileUrl:  http://escloud.snd.gov.cn/uploads
+fileUrl: http://escloud.snd.gov.cn/uploads
 
 #访问外网路径
 fileOutUrl: http://escloud.snd.gov.cn/uploads

src/main/resources/mapper/company/StockLandDao.xml

@@ -187,7 +187,6 @@
 			d.NAME AS approve_status_name,
 			g.CHECKER,
 			g.DEAL_TIME as deal_time,
-
 			hour(timediff(date_add(IFNULL(a.update_time,a.create_time),interval 5 day),NOW())) as overTime
 		FROM
 			c_stock_land_apply a
@@ -222,7 +221,7 @@
 			</if>
 
 			and g.del_flag = 0
-			)q
+			) q
 			WHERE 1=1
 		<if test="condition.approve_status != null and condition.approve_status!=''">
 			and q.approve_status=#{condition.approve_status}

src/main/resources/static/js/government/areaManager/areaManager_list.js

@@ -4,13 +4,11 @@ $(function () {
     var buttonStatus = $("#buttonStatus").val();
 
     if(status == 2){
-        // wj 添加简易流程分发
-        if(apply_type == 2 || apply_type == 3 ){
+        if(apply_type == 2){
             //$('#jylctg').css({ "display": "inline-block" });
         	$('#jylcff').css({ "display": "inline-block" });
         }
         $("#fsgbm").css({ "display": "inline-block" });
-
         //待分发没有退回按钮status
         //$("#bh").css({ "display": "inline-block" });
     }else if(status == 3){