优化代码

wuxw

2024-10-31 9daeb7b3d3b20a78775bd175746c052682e84f9c

优化代码

 java110-bean/src/main/java/com/java110/dto/workPoolFile/WorkPoolFileDto.java

@@ -36,7 +36,7 @@

    private String itemId;


    private String contentId;
    private Date createTime;

    private String statusCd = "0";
@@ -154,4 +154,12 @@
    public void setItemId(String itemId) {
        this.itemId = itemId;
    }

    public String getContentId() {
        return contentId;
    }

    public void setContentId(String contentId) {
        this.contentId = contentId;
    }
}

 java110-bean/src/main/java/com/java110/po/workPoolFile/WorkPoolFilePo.java

@@ -40,6 +40,8 @@

    private String itemId;

    private String contentId;


    public String getPathUrl() {
        return pathUrl;
@@ -112,4 +114,12 @@
    public void setItemId(String itemId) {
        this.itemId = itemId;
    }

    public String getContentId() {
        return contentId;
    }

    public void setContentId(String contentId) {
        this.contentId = contentId;
    }
}

 java110-db/src/main/resources/mapper/oa/WorkEventV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
    <!-- 保存工作单事件信息 add by wuxw 2018-07-03 -->
    <insert id="saveWorkEventInfo" parameterType="Map">
        insert into work_event(
        event_id,pre_staff_name,pre_staff_id,staff_name,remark,community_id,store_id,task_id,work_id,staff_id,item_id
        event_id,pre_staff_name,pre_staff_id,staff_name,remark,community_id,store_id,task_id,work_id,staff_id,item_id,content_id
        ) values (
        #{eventId},#{preStaffName},#{preStaffId},#{staffName},#{remark},#{communityId},#{storeId},#{taskId},#{workId},#{staffId},#{itemId}
        #{eventId},#{preStaffName},#{preStaffId},#{staffName},#{remark},#{communityId},#{storeId},#{taskId},#{workId},#{staffId},#{itemId},#{contentId}
        )
    </insert>

@@ -22,7 +22,7 @@
        staffName,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
        communityId,t.store_id,t.store_id storeId,t.task_id,t.task_id taskId,t.work_id,t.work_id
        workId,t.staff_id,t.staff_id staffId,t.create_time createTime,wt.start_time startTime,wt.end_time endTime,
        t.item_id itemId
        t.item_id itemId,t.content_id contentId
        from work_event t
        left join work_task wt on t.task_id = wt.task_id
        where 1 =1
@@ -64,6 +64,9 @@
        </if>
        <if test="itemId !=null and itemId != ''">
            and t.item_id= #{itemId}
        </if>
        <if test="contentId !=null and contentId != ''">
            and t.content_id= #{contentId}
        </if>
        <if test="queryStartTime !=null and queryStartTime != ''">
            and t.create_time &gt; #{queryStartTime}
@@ -170,6 +173,9 @@
        <if test="itemId !=null and itemId != ''">
            and t.item_id= #{itemId}
        </if>
        <if test="contentId !=null and contentId != ''">
            and t.content_id= #{contentId}
        </if>
        <if test="queryStartTime !=null and queryStartTime != ''">
            and t.create_time &gt; #{queryStartTime}
        </if>

 java110-db/src/main/resources/mapper/oa/WorkPoolFileV1ServiceDaoImplMapper.xml

@@ -5,8 +5,8 @@

    <!-- 保存工作单文件信息 add by wuxw 2018-07-03 -->
    <insert id="saveWorkPoolFileInfo" parameterType="Map">
        insert into work_pool_file(path_url, community_id, store_id, work_id, file_id, task_id, file_type,item_id)
        values (#{pathUrl}, #{communityId}, #{storeId}, #{workId}, #{fileId}, #{taskId}, #{fileType},#{itemId})
        insert into work_pool_file(path_url, community_id, store_id, work_id, file_id, task_id, file_type,item_id,content_id)
        values (#{pathUrl}, #{communityId}, #{storeId}, #{workId}, #{fileId}, #{taskId}, #{fileType},#{itemId},#{contentId})
    </insert>

    <!-- 查询工作单文件信息 add by wuxw 2018-07-03 -->
@@ -44,6 +44,9 @@
        </if>
        <if test="itemId !=null and itemId != ''">
            and t.item_id= #{itemId}
        </if>
        <if test="contentId !=null and contentId != ''">
            and t.content_id= #{contentId}
        </if>
        <if test="staffNameLike !=null and staffNameLike != ''">
            and wt.staff_name like concat('%', #{staffNameLike},'%')
@@ -88,6 +91,9 @@
        <if test="workId !=null and workId != ''">
            and t.work_id= #{workId}
        </if>
        <if test="contentId !=null and contentId != ''">
            and t.content_id= #{contentId}
        </if>
    </update>

    <!-- 查询工作单文件数量 add by wuxw 2018-07-03 -->
@@ -123,6 +129,9 @@
        <if test="itemId !=null and itemId != ''">
            and t.item_id= #{itemId}
        </if>
        <if test="contentId !=null and contentId != ''">
            and t.content_id= #{contentId}
        </if>
        <if test="staffNameLike !=null and staffNameLike != ''">
            and wt.staff_name like concat('%', #{staffNameLike},'%')
        </if>

 service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java

@@ -86,12 +86,20 @@
        workTaskDto.setStoreId(storeId);
        List<WorkTaskDto> workTaskDtos = workTaskV1InnerServiceSMOImpl.queryWorkTasks(workTaskDto);

        WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
        workTaskItemDto.setItemId(reqJson.getString("itemId"));
        workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
        List<WorkTaskItemDto> workTaskItemDtos = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItems(workTaskItemDto);

        if (ListUtil.isNull(workTaskItemDtos)) {
            throw new CmdException("任务明细不存在");
        }

        //todo 转单
        if ("T".equals(reqJson.getString("auditCode"))) {
            doTransfor(reqJson, workTaskDtos.get(0));
        } else if ("C".equals(reqJson.getString("auditCode"))) {
            doFinish(reqJson, workTaskDtos.get(0));
            doFinish(reqJson, workTaskDtos.get(0), workTaskItemDtos.get(0));
        }

        if (!reqJson.containsKey("pathUrl")) {
@@ -112,6 +120,9 @@
        workPoolFilePo.setPathUrl(reqJson.getString("pathUrl"));
        workPoolFilePo.setStoreId(workTaskDtos.get(0).getStoreId());
        workPoolFilePo.setItemId(reqJson.getString("itemId"));

        workPoolFilePo.setContentId(workTaskItemDtos.get(0).getContentId());

        workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo);

    }
@@ -122,7 +133,7 @@
     * @param reqJson
     * @param workTaskDto
     */
    private void doFinish(JSONObject reqJson, WorkTaskDto workTaskDto) {
    private void doFinish(JSONObject reqJson, WorkTaskDto workTaskDto, WorkTaskItemDto orgWorkTaskItemDto) {

        Date endTime = DateUtil.getDateFromStringA(workTaskDto.getEndTime());

@@ -175,10 +186,7 @@
            preStaffName = workEventDtos.get(0).getStaffName();

        }
        WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
        workTaskItemDto.setItemId(reqJson.getString("itemId"));
        workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
        List<WorkTaskItemDto> workTaskItemDtos = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItems(workTaskItemDto);


        //todo 保存事件
        WorkEventPo workEventPo = new WorkEventPo();
@@ -193,14 +201,12 @@
        workEventPo.setStoreId(workTaskDto.getStoreId());
        workEventPo.setTaskId(workTaskDto.getTaskId());
        workEventPo.setItemId(reqJson.getString("itemId"));
        workEventPo.setContentId("-1");
        if (!ListUtil.isNull(workTaskItemDtos)) {
            workEventPo.setContentId(workTaskItemDtos.get(0).getContentId());
        }
        workEventPo.setContentId(orgWorkTaskItemDto.getContentId());

        workEventV1InnerServiceSMOImpl.saveWorkEvent(workEventPo);

        // todo 查询 任务明细是否处理完成
        workTaskItemDto = new WorkTaskItemDto();
        WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
        workTaskItemDto.setTaskId(workTaskDto.getTaskId());
        workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
        workTaskItemDto.setState(WorkTaskDto.STATE_WAIT);

 service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java

@@ -234,6 +234,8 @@
            workPoolFilePo.setTaskId(workTaskPo.getTaskId());
            workPoolFilePo.setPathUrl(reqJson.getString("pathUrl"));
            workPoolFilePo.setStoreId(workPoolPo.getStoreId());
            workPoolFilePo.setItemId("-1");
            workPoolFilePo.setContentId("-1");
            workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo);
        }
    }