存量用地修改 简易流程修改 及测试代码修改

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

@@ -346,7 +346,7 @@ 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"; //待分发s
+        public static String PENDING_DISTRIBUTE = "2"; //待分发
         public static String COMPLIANCE_AUDIT = "3"; //合规性审查
         public static String UNITED_AUDIT = "4"; //联合评议
         public static String TWICE_UNITED_AUDIT = "5"; //二次联合评议

src/main/java/platform/modules/company/dao/StockLandDao.java

@@ -2,7 +2,6 @@ package platform.modules.company.dao;
 
 import org.apache.ibatis.annotations.Param;
 import platform.common.base.mapper.BaseMapper;
-import platform.modules.company.dto.StockLandStatistic;
 import platform.modules.company.entity.StockLand;
 import platform.modules.government.dto.GovStatisticsDto;
 import platform.modules.government.dto.SearchCondition;
@@ -52,7 +51,10 @@ public interface StockLandDao extends BaseMapper<StockLand>{
 
     List<StockLand> findListByCondition(@Param("condition") SearchCondition searchCondition);
 
-	List<StockLandStatistic> findListByStreetId(@Param("street_id") String street_id, @Param("apply_user_type") Integer applyUserType);
+	List<StockLand> findListByStreetId(@Param("street_id") String street_id,@Param("apply_user_type") Integer applyUserType);
 
-	List<StockLandStatistic> findListByStreetIdAndTime(@Param("street_id") String street_id, @Param("start_time") String startTime ,@Param("end_time") String endTime);
+	// 添加自动审批简易流程sql
+	Integer insertAutoEasyProcessDataToStockLand(@Param("applyid") String applyid);
+
+	Integer updateEasyProcessData(@Param("applyNoList") List<String> applyNoList);
 }

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

@@ -637,21 +637,24 @@ public class StockLandApproveService extends BaseService<StockLand> {
 
             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)
+            }
+            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)
+            }
+            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 {
-                logger.error("=====错误=====");
-                logger.error("单据的状态:{}", apply.getApprove_status());
-                logger.error("单据数据：{}", apply);
-                logger.error("消息数据：{}", message);
-                logger.error("============");
-                throw new RuntimeException("错误的单据状态：" + apply.getApprove_status());
             }
+//            else {
+            logger.info("===单据信息====");
+            logger.info("单据的状态:{}", apply.getApprove_status());
+            logger.info("单据数据：{}", apply);
+            logger.info("消息数据：{}", message);
+            logger.info("============");
+//                throw new RuntimeException("错误的单据状态：" + apply.getApprove_status());
+//            }
 
             stockLandService.updateSelective(apply);
             //置空临时状态
@@ -708,6 +711,7 @@ public class StockLandApproveService extends BaseService<StockLand> {
             if (StringUtils.isNotBlank(apply.getApply_type())) {
                 apply_type = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.STOCKLAND, apply.getApply_type());
             }
+
             String approve_status = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.STOCKLAND_APPROVE_STATUS, apply.getApprove_status());
 
             String street_name = ShiroUtils.getUserEntity().getStreet_name();

src/main/resources/application.yml

@@ -157,7 +157,8 @@ spring:
   profiles: dev
   #数据源
   datasource:
-    url: jdbc:mysql://222.92.16.3:33061/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
+    url: jdbc:mysql://10.44.104.42:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
   #redis
@@ -323,6 +324,7 @@ spring:
 #日志
 logging:
   config: classpath:logback-jk.xml
+  level: debug
 #  path: /logs
 
 #数据库密码加密

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

@@ -438,29 +438,15 @@ order by a.create_time desc
 	</select>
 
 
-	<!-- 所有存量用地数据 -->
-	<select id="findListByStreetId" resultType="platform.modules.company.dto.StockLandStatistic">
+	<!-- 审核通过的列表 -->
+	<select id="findListByStreetId" resultType="platform.modules.company.entity.StockLand">
 		SELECT
-			stockland.id,
 			stockland.street_id,
 			stockland.apply_type,
 			stockland.apply_status,
 			stockland.approve_status,
 			stockland.process_status,
-			zuser.user_type AS apply_user_type,
-			(
-				SELECT
-					approval_round
-				FROM
-					z_approval
-				WHERE
-					apply_id = stockland.id
-				AND type = "存量用地"
-				AND del_flag = 0
-				AND is_withdraw IS NULL
-				ORDER BY id DESC
-				LIMIT 0,1
-			) approval_round
+			zuser.user_type AS applyUserType
 		FROM
 			c_stock_land_apply stockland
 		LEFT JOIN
@@ -475,30 +461,25 @@ order by a.create_time desc
 		</if>
 	</select>
 
-	<!-- 获取除待提交外的申请 -->
-	<select id="findListByStreetIdAndTime" resultType="platform.modules.company.dto.StockLandStatistic">
-		SELECT
-			stockland.id,
-			stockland.street_id,
-			stockland.apply_type,
-			stockland.apply_status,
-			stockland.approve_status,
-			stockland.process_status,
-			stockland.summary_procedure,
-			stockland.create_time
-		FROM
-			c_stock_land_apply stockland
-		WHERE
-			stockland.del_flag = '0'
-		AND stockland.apply_status != 0
-		<if test="street_id != null and street_id != ''">
-			AND stockland.street_id = #{street_id}
-		</if>
-		<if test="start_time != null and start_time != ''">
-			AND stockland.create_time <![CDATA[>=]]> #{start_time}
-		</if>
-		<if test="end_time != null and end_time != ''">
-			AND stockland.create_time <![CDATA[<=]]> #{end_time}
-		</if>
-	</select>
+
+	<update id="updateEasyProcessData" >
+UPDATE c_stock_land_apply
+SET approve_status = "80",
+apply_status = 3,
+update_by = 0,
+update_name = "sql",
+update_time = CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME )
+WHERE
+	apply_no in
+		<foreach collection="applyNoList" index="index" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
+	<insert id="insertAutoEasyProcessDataToStockLand" >
+	INSERT INTO `z_approval`
+	(`APPLY_ID`,   `TYPE`,   `DEPARTMENT`, `BEFORE_APPROVALSTATUS`, `AFTER_APPROVALSTATUS`, `CHECKER`, `NEXTCHECKER`, `APPROVAL_COMMENT`, `APPROVAL_ROUND`,               `CREATE_TIME`,                         `CREATE_BY`,   `UPDATE_TIME`,                                  `UPDATE_BY`, `DEAL_TIME`,       `STATUS`,        `DEL_FLAG`, `ACTION_FLAG`, `TRANS_FLAG`, `REMARK`, `OPER_TYPE`,  `PRO_INSTANCE_ID`, `CREATE_NAME`, `UPDATE_NAME`, `IS_WITHDRAW`, `CAN_WITHDRAW`)
+	VALUES (#{applyid}, '存量用地', '企业服务处',     '2',                    '14',                    140,        '',         '做简易流程处理',        1,                CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME ),       140,         CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME ),            NULL,       NULL,       0,                   0,           NULL,       NULL,        '通过',     '通过',       null,            '张磊',         "sql",            null,       NULL)
+	,(#{applyid}, '存量用地',     '企业服务处',         '14',                      '80',                    140,         '',        '审核通过',             1,             CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME ), '140',     CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME ),       NULL,       NULL,               0,             0,                NULL,        NULL,     NULL,     '通过',       null,              '张磊',       "sql",          NULL,            NULL)
+	</insert>
 </mapper>