Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java

@@ -234,5 +234,22 @@ public class BPlanEnterprise {
     private Date examineEndTime;
 
 
+    /**
+     * 检查时间
+     */
+    @ApiModelProperty(value = "上次检查时间")
+    private Date checkTime;
+
+
+
+
+    /**
+     * 企业信用代码
+     */
+    @ApiModelProperty(value = "企业信用代码")
+    private String uuto;
+
+
+
 }
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java

@@ -223,4 +223,11 @@ public class BPlanEnterpriseRequest {
     @ApiModelProperty(value = "上次检查时间")
     private Date examineEndTime;
 
+
+
+    /**
+     * 企业信用代码
+     */
+    @ApiModelProperty(value = "企业信用代码")
+    private String uuto;
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java

@@ -41,13 +41,13 @@ public class checkResultRequest {
      * 0：未检查 1：已检查
      */
     @ApiModelProperty(value = "0：未检查 1：已检查")
-    private Integer checkStatus;
+    private String checkStatus;
 
     /**
      * 0：草稿 1：正式
      */
     @ApiModelProperty(value = "0：草稿 1：正式")
-    private Integer status;
+    private String status;
 
 
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java

@@ -228,4 +228,16 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private Date examineEndTime;
 
 
+    /**
+     * 检查时间
+     */
+    @ApiModelProperty(value = "上次检查时间")
+    private Date checkTime;
+
+    /**
+     * 企业信用代码
+     */
+    @ApiModelProperty(value = "企业信用代码")
+    private String uuto;
+
 }

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java

@@ -174,7 +174,7 @@ public class BPlanEnterpriseZhifaResponse {
      * 0：未检查 1：已检查
      */
     @ApiModelProperty(value = "0：未检查 1：已检查")
-    private Integer checkStatus;
+    private Long checkStatus;
 
 
     /**

ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml

@@ -197,7 +197,6 @@
                  LEFT JOIN (
             SELECT USC_CODE, MAX(EXAMINE_END_TIME) AS MAX_EXAMINE_END_TIME
             FROM sz_enfor_examine
-            WHERE YEAR(EXAMINE_END_TIME) = YEAR(CURDATE())
             GROUP BY USC_CODE
         ) e ON a.enterprise_id = e.USC_CODE COLLATE utf8mb4_unicode_ci;
     </select>

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -29,7 +29,9 @@
                status,
                check_status,
                check_id,
-               check_ageing
+               check_ageing,
+               uuto,
+               check_time
         from b_plan_enterprise
     </sql>
 
@@ -56,6 +58,8 @@
         a.law_areas,
         a.law_level,
         a.law_hierarchy,
+        a.uuto,
+        a.check_time,
         a.planned_month as plannedMonth,
         a.status,
         a.check_status,
@@ -136,6 +140,8 @@
         a.law_hierarchy,
         a.planned_month,
         a.status,
+        a.uuto,
+        a.check_time,
         a.check_status,
         a.check_id,
         a.check_ageing,
@@ -252,6 +258,8 @@
                a.user_id,
                a.dept_id,
                a.district,
+               a.uuto,
+               a.check_time,
                a.planned_year,
                a.is_point,
                a.enterprise_name as entprName
@@ -318,7 +326,7 @@
 
     </select>
     <select id="selectUpdateAll" resultType="com.ruoyi.programManagement.entity.BPlanEnterprise">
-        SELECT a.id, a.enterprise_id, a.district, a.planned_year, a.is_point, a.enterprise_name, a.law_sort, a.law_areas, a.law_level, a.law_hierarchy, a.planned_month, a.status,
+        SELECT a.id, a.enterprise_id, a.district, a.planned_year, a.is_point, a.enterprise_name, a.law_sort, a.law_areas, a.law_level, a.law_hierarchy, a.planned_month, a.status,e.MAX_EXAMINE_END_TIME as check_time,
         CASE
         WHEN e.MAX_EXAMINE_END_TIME IS NULL THEN 0
         WHEN YEAR(e.MAX_EXAMINE_END_TIME) = a.planned_year AND MONTH(e.MAX_EXAMINE_END_TIME) = a.planned_month THEN 1
@@ -372,6 +380,7 @@
             <if test="remark != null">remark=#{remark},</if>
             <if test="userId != null">user_id=#{userId},</if>
             <if test="deptId != null">dept_id=#{deptId},</if>
+            <if test="uuto != null">uuto =#{uuto},</if>
         </trim>
         where id = #{id}
     </update>
@@ -401,6 +410,8 @@
             <if test="remark != null">remark,</if>
             <if test="userId != null">user_id,</if>
             <if test="deptId != null">dept_id,</if>
+            <if test="uuto != null">uuto,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="enterpriseId != null">#{enterpriseId},</if>
@@ -423,6 +434,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="userId != null">#{userId},</if>
             <if test="deptId != null">#{deptId},</if>
+            <if test="uuto != null">#{uuto},</if>
         </trim>
     </insert>