优化导入日志功能

java110-bean/src/main/java/com/java110/dto/log/AssetImportLogDto.java

@@ -26,7 +26,7 @@ public class AssetImportLogDto extends PageDto implements Serializable {
      * 5005	费用信息
      * 6006	车位车辆
      */
-    public static final String LOG_TYPE_FLOOR_UNIT_IMPORT = "1001";
+    public static final String LOG_TYPE_FLOOR_UNIT_IMPORT = "importRoomOwner";
     public static final String LOG_TYPE_HISTORY_FEE_IMPORT = "2002";
     public static final String LOG_TYPE_OWENR_IMPORT = "3003";
     public static final String LOG_TYPE_ROOM_IMPORT = "4004";
@@ -47,6 +47,10 @@ public class AssetImportLogDto extends PageDto implements Serializable {
 
     private String state;
 
+
+    private String stateName;
+
+
     List<AssetImportLogDetailDto> assetImportLogDetailDtos;
 
 
@@ -147,4 +151,12 @@ public class AssetImportLogDto extends PageDto implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-bean/src/main/java/com/java110/po/log/AssetImportLogPo.java

@@ -12,6 +12,9 @@ public class AssetImportLogPo implements Serializable {
     private String communityId;
     private String errorCount;
 
+    private String state;
+
+
     public String getLogType() {
         return logType;
     }
@@ -68,5 +71,11 @@ public class AssetImportLogPo implements Serializable {
         this.errorCount = errorCount;
     }
 
+    public String getState() {
+        return state;
+    }
 
+    public void setState(String state) {
+        this.state = state;
+    }
 }

java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml

@@ -19,9 +19,10 @@
     <select id="getAssetImportLogInfo" parameterType="Map" resultType="Map">
         select t.log_type,t.log_type logType,t.success_count,t.success_count successCount,t.log_id,t.log_id
         logId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
-        communityId,t.error_count,t.error_count errorCount,t.create_time createTime,td.`name` logTypeName
+        communityId,t.error_count,t.error_count errorCount,t.create_time createTime,t.state,td.`name` logTypeName,td1.name stateName
         from asset_import_log t
         LEFT JOIN t_dict td on t.log_type = td.status_cd and td.table_name = 'asset_import_log' and td.table_columns = 'log_type'
+        LEFT JOIN t_dict td1 on t.state = td1.status_cd and td1.table_name = 'asset_import_log' and td1.table_columns = 'state'
         where 1 =1
         <if test="logType !=null and logType != ''">
             and t.log_type= #{logType}
@@ -44,6 +45,9 @@
         <if test="errorCount !=null and errorCount != ''">
             and t.error_count= #{errorCount}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -67,17 +71,19 @@
         <if test="remark !=null and remark != ''">
             , t.remark= #{remark}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
         <if test="errorCount !=null and errorCount != ''">
             , t.error_count= #{errorCount}
         </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
         where 1=1
         <if test="logId !=null and logId != ''">
             and t.log_id= #{logId}
         </if>
-
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
     </update>
 
     <!-- 查询批量操作日志数量 add by wuxw 2018-07-03 -->
@@ -106,6 +112,9 @@
         <if test="errorCount !=null and errorCount != ''">
             and t.error_count= #{errorCount}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
 
 
     </select>

java110-utils/src/main/java/com/java110/utils/util/BpmnXml.java

@@ -17,7 +17,7 @@ public class BpmnXml {
                 "      <bpmn2:outgoing>Flow_107cj2o</bpmn2:outgoing>\n" +
                 "    </bpmn2:userTask>\n" +
                 "    <bpmn2:sequenceFlow id=\"Flow_107cj2o\" sourceRef=\"Activity_1horz27\" targetRef=\"Activity_15b7rm5\"/>\n" +
-                "    <bpmn2:userTask id=\"Activity_15b7rm5\" name=\"审批人\" camunda:assignee=\"\">\n" +
+                "    <bpmn2:userTask id=\"Activity_15b7rm5\" name=\"审批人\" camunda:assignee=\"${nextUserId}\">\n" +
                 "      <bpmn2:incoming>Flow_107cj2o</bpmn2:incoming>\n" +
                 "      <bpmn2:outgoing>Flow_06hzw4i</bpmn2:outgoing>\n" +
                 "    </bpmn2:userTask>\n" +
@@ -70,7 +70,7 @@ public class BpmnXml {
                 "      <bpmn2:outgoing>Flow_107cj2o</bpmn2:outgoing>\n" +
                 "    </bpmn2:userTask>\n" +
                 "    <bpmn2:sequenceFlow id=\"Flow_107cj2o\" sourceRef=\"Activity_1horz27\" targetRef=\"Activity_15b7rm5\"/>\n" +
-                "    <bpmn2:userTask id=\"Activity_15b7rm5\" name=\"审批人\" camunda:assignee=\"\">\n" +
+                "    <bpmn2:userTask id=\"Activity_15b7rm5\" name=\"审批人\" camunda:assignee=\"${nextUserId}\">\n" +
                 "      <bpmn2:incoming>Flow_107cj2o</bpmn2:incoming>\n" +
                 "      <bpmn2:outgoing>Flow_06hzw4i</bpmn2:outgoing>\n" +
                 "    </bpmn2:userTask>\n" +
@@ -123,7 +123,7 @@ public class BpmnXml {
                 "      <bpmn2:outgoing>Flow_107cj2o</bpmn2:outgoing>\n" +
                 "    </bpmn2:userTask>\n" +
                 "    <bpmn2:sequenceFlow id=\"Flow_107cj2o\" sourceRef=\"Activity_1horz27\" targetRef=\"Activity_15b7rm5\"/>\n" +
-                "    <bpmn2:userTask id=\"Activity_15b7rm5\" name=\"审批人\" camunda:assignee=\"\">\n" +
+                "    <bpmn2:userTask id=\"Activity_15b7rm5\" name=\"审批人\" camunda:assignee=\"${nextUserId}\">\n" +
                 "      <bpmn2:incoming>Flow_107cj2o</bpmn2:incoming>\n" +
                 "      <bpmn2:outgoing>Flow_06hzw4i</bpmn2:outgoing>\n" +
                 "    </bpmn2:userTask>\n" +