Merge remote-tracking branch 'origin/dev' into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java

@@ -65,42 +65,42 @@ public class AppEnterpriseComplaintBo extends BaseEntity {
     private String caseType;
 
     /**
-     *
+     * 是否授权 0：不同意 1：同意
      */
     private Long authorization;
 
     /**
-     *
+     *投诉/意见 0:投诉; 1:意见
      */
     private Long comOrOpi;
 
     /**
-     *
+     *涉事地址
      */
     private String enterpriseAddress;
 
     /**
-     *
+     *关联工单
      */
     private String proWoCode;
 
     /**
-     *
+     *(0：默认0)工单状态
      */
     private Long status;
 
     /**
-     *
+     *可评价 同步时间
      */
     private Date evaluateTime;
 
     /**
-     *
+     *统一信用代码
      */
     private String enterpriseNumber;
 
     /**
-     *
+     *企业名称
      */
     private String enterpriseName;
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/AppEnterpriseComplaintVo.java

@@ -175,4 +175,10 @@ public class AppEnterpriseComplaintVo implements Serializable {
      */
     @ExcelProperty(value = "文件列表")
     private List<ZdxtFileVo> fileList;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
 }

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml

@@ -20,7 +20,7 @@
             on t1.c601000 = t2.c601000
         <where>
             <if test="bo.idNumber!=null and bo.idNumber!=''">
-                and t2.C601034 =#{dto.idNumber}
+                and t2.C601034 =#{bo.idNumber}
             </if>
         </where>
         union all
@@ -41,7 +41,7 @@
             t1.c301000 = t3.c301000
         <where>
             <if test="bo.idNumber!=null and bo.idNumber!=''">
-                and t3.c301010 =#{dto.idNumber}
+                and t3.c301010 =#{bo.idNumber}
             </if>
         </where>
         union all
@@ -62,7 +62,7 @@
             t1.c201000 = t3.c201000
         <where>
             <if test="bo.idNumber!=null and bo.idNumber!=''">
-               and t3.c201016 =#{dto.idNumber}
+               and t3.c201016 =#{bo.idNumber}
             </if>
         </where>
     </select>