加入状态名称

java110-bean/src/main/java/com/java110/dto/inspectionTaskDetail/InspectionTaskDetailDto.java

@@ -18,6 +18,7 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     private String inspectionId;
     private String inspectionName;
     private String state;
+    private String stateName;
     private String communityId;
     private String taskId;
     private String taskDetailId;
@@ -92,4 +93,12 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/inspectionTaskDetail/ApiInspectionTaskDetailDataVo.java

@@ -6,69 +6,94 @@ import java.util.Date;
 public class ApiInspectionTaskDetailDataVo implements Serializable {
 
     private String inspectionId;
-private String operate;
-private String statusCd;
-private String inspectionName;
-private String state;
-private String communityId;
-private String bId;
-private String taskId;
-private String taskDetailId;
-public String getInspectionId() {
+    private String operate;
+    private String statusCd;
+    private String inspectionName;
+    private String state;
+    private String stateName;
+    private String communityId;
+    private String bId;
+    private String taskId;
+    private String taskDetailId;
+
+    public String getInspectionId() {
         return inspectionId;
     }
-public void setInspectionId(String inspectionId) {
+
+    public void setInspectionId(String inspectionId) {
         this.inspectionId = inspectionId;
     }
-public String getOperate() {
+
+    public String getOperate() {
         return operate;
     }
-public void setOperate(String operate) {
+
+    public void setOperate(String operate) {
         this.operate = operate;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getInspectionName() {
+
+    public String getInspectionName() {
         return inspectionName;
     }
-public void setInspectionName(String inspectionName) {
+
+    public void setInspectionName(String inspectionName) {
         this.inspectionName = inspectionName;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getBId() {
+
+    public String getBId() {
         return bId;
     }
-public void setBId(String bId) {
+
+    public void setBId(String bId) {
         this.bId = bId;
     }
-public String getTaskId() {
+
+    public String getTaskId() {
         return taskId;
     }
-public void setTaskId(String taskId) {
+
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
-public String getTaskDetailId() {
+
+    public String getTaskDetailId() {
         return taskDetailId;
     }
-public void setTaskDetailId(String taskDetailId) {
+
+    public void setTaskDetailId(String taskDetailId) {
         this.taskDetailId = taskDetailId;
     }
 
 
+    public String getStateName() {
+        return stateName;
+    }
 
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml

@@ -5,183 +5,190 @@
 <mapper namespace="inspectionTaskDetailServiceDaoImpl">
 
     <!-- 保存巡检任务明细信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessInspectionTaskDetailInfo" parameterType="Map">
-           insert into business_inspection_task_detail(
-inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id
-) values (
-#{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId}
-)
-       </insert>
-
-
-       <!-- 查询巡检任务明细信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
-           select  t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId 
-from business_inspection_task_detail t 
-where 1 =1 
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="inspectionName !=null and inspectionName != ''">
-   and t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-   and t.task_detail_id= #{taskDetailId}
-</if> 
-
-       </select>
+    <insert id="saveBusinessInspectionTaskDetailInfo" parameterType="Map">
+        insert into business_inspection_task_detail(
+        inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id
+        ) values (
+        #{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId}
+        )
+    </insert>
 
 
+    <!-- 查询巡检任务明细信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
+        select t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_name,t.inspection_name
+        inspectionName,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.task_id,t.task_id
+        taskId,t.task_detail_id,t.task_detail_id taskDetailId
+        from business_inspection_task_detail t
+        where 1 =1
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
 
+    </select>
 
 
     <!-- 保存巡检任务明细信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionTaskDetailInfoInstance" parameterType="Map">
         insert into inspection_task_detail(
-inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id
-) select t.inspection_id,'0',t.inspection_name,t.state,t.community_id,t.b_id,t.task_id,t.task_detail_id from business_inspection_task_detail t where 1=1
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-   and t.operate= 'ADD'
-<if test="inspectionName !=null and inspectionName != ''">
-   and t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-   and t.task_detail_id= #{taskDetailId}
-</if> 
+        inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id
+        ) select t.inspection_id,'0',t.inspection_name,t.state,t.community_id,t.b_id,t.task_id,t.task_detail_id from
+        business_inspection_task_detail t where 1=1
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询巡检任务明细信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
-        select  t.inspection_id,t.inspection_id inspectionId,t.status_cd,t.status_cd statusCd,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId 
-from inspection_task_detail t 
-where 1 =1 
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="inspectionName !=null and inspectionName != ''">
-   and t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-   and t.task_detail_id= #{taskDetailId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.inspection_id,t.inspection_id inspectionId,t.status_cd,t.status_cd
+        statusCd,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id
+        communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId,
+        td1.name stateName
+        from inspection_task_detail t,t_dict td1
+        where 1 =1
+        and t.state = td1.status_cd
+        and td1.table_name = 'inspection_task_detail'
+        and td1.table_columns = 'state'
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改巡检任务明细信息 add by wuxw 2018-07-03 -->
     <update id="updateInspectionTaskDetailInfoInstance" parameterType="Map">
-        update  inspection_task_detail t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="inspectionId !=null and inspectionId != ''">
-, t.inspection_id= #{inspectionId}
-</if> 
-<if test="inspectionName !=null and inspectionName != ''">
-, t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-, t.task_id= #{taskId}
-</if> 
- where 1=1 <if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-and t.task_detail_id= #{taskDetailId}
-</if> 
+        update inspection_task_detail t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="inspectionId !=null and inspectionId != ''">
+            , t.inspection_id= #{inspectionId}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            , t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            , t.task_id= #{taskId}
+        </if>
+        where 1=1
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
 
     </update>
 
     <!-- 查询巡检任务明细数量 add by wuxw 2018-07-03 -->
-     <select id="queryInspectionTaskDetailsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from inspection_task_detail t 
-where 1 =1 
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="inspectionName !=null and inspectionName != ''">
-   and t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-   and t.task_detail_id= #{taskDetailId}
-</if> 
-
-
-     </select>
+    <select id="queryInspectionTaskDetailsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from inspection_task_detail t,t_dict td1
+        where 1 =1
+        and t.state = td1.status_cd
+        and td1.table_name = 'inspection_task_detail'
+        and td1.table_columns = 'state'
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
+
+
+    </select>
 
 </mapper>