完成工作单

java110-bean/src/main/java/com/java110/dto/workCopy/WorkCopyDto.java

@@ -33,6 +33,8 @@ public class WorkCopyDto extends PageDto implements Serializable {
     private String[] workIds;
     private String staffId;
 
+    private String remark;
+
 
     private Date createTime;
 
@@ -135,4 +137,12 @@ public class WorkCopyDto extends PageDto implements Serializable {
     public void setStaffNameLike(String staffNameLike) {
         this.staffNameLike = staffNameLike;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-bean/src/main/java/com/java110/dto/workPool/WorkPoolDto.java

@@ -63,6 +63,8 @@ public class WorkPoolDto extends PageDto implements Serializable {
 
     private String copyId;
 
+    private String remark ;
+
 
     public String getWorkCycle() {
         return workCycle;
@@ -264,4 +266,12 @@ public class WorkPoolDto extends PageDto implements Serializable {
     public void setCopyId(String copyId) {
         this.copyId = copyId;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-bean/src/main/java/com/java110/po/workCopy/WorkCopyPo.java

@@ -37,6 +37,8 @@ public class WorkCopyPo implements Serializable {
     private String workId;
     private String staffId;
 
+    private String remark;
+
     public String getCopyId() {
         return copyId;
     }
@@ -101,5 +103,11 @@ public class WorkCopyPo implements Serializable {
         this.staffId = staffId;
     }
 
+    public String getRemark() {
+        return remark;
+    }
 
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

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

@@ -19,7 +19,7 @@
     <select id="getWorkCopyInfo" parameterType="Map" resultType="Map">
         select t.copy_id,t.copy_id copyId,t.staff_name,t.staff_name staffName,t.status_cd,t.status_cd
         statusCd,t.state,t.community_id,t.community_id communityId,t.store_id,t.store_id storeId,t.work_id,t.work_id
-        workId,t.staff_id,t.staff_id staffId,t.create_time createTime,td.`name` stateName
+        workId,t.staff_id,t.staff_id staffId,t.create_time createTime,td.`name` stateName,t.remark
         from work_copy t
         left join t_dict td on t.state = td.status_cd and td.table_name = 'work_pool' and td.table_columns = 'state'
         where 1 =1
@@ -81,6 +81,9 @@
         <if test="staffId !=null and staffId != ''">
             , t.staff_id= #{staffId}
         </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
         where 1=1
         <if test="copyId !=null and copyId != ''">
             and t.copy_id= #{copyId}

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

@@ -339,7 +339,7 @@
         statusCd,t.store_id storeId,t.work_name workName,t.work_id
         workId,t.wt_id wtId,t.create_user_tel createUserTel,t.start_time
         startTime,t.end_time endTime,wc.state,t.community_id communityId,t.create_time createTime,
-        td.`name` stateName,wt.type_name typeName,wc.staff_name curCopyName,wc.copy_id copyId
+        td.`name` stateName,wt.type_name typeName,wc.staff_name curCopyName,wc.copy_id copyId,wc.remark
         from work_pool t
         left join work_type wt on t.wt_id = wt.wt_id
         left join work_copy wc on t.work_id = wc.work_id and wc.status_cd = '0'

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

@@ -0,0 +1,52 @@
+package com.java110.oa.cmd.work;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.workCopy.WorkCopyDto;
+import com.java110.dto.workPool.WorkPoolDto;
+import com.java110.intf.oa.IWorkCopyV1InnerServiceSMO;
+import com.java110.po.workCopy.WorkCopyPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.ListUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "work.finishWorkCopy")
+public class FinishWorkCopyCmd extends Cmd {
+
+    @Autowired
+    private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.hasKeyAndValue(reqJson, "copyId", "未包含抄送人");
+        Assert.hasKeyAndValue(reqJson, "auditMessage", "未包含说明");
+        String userId = CmdContextUtils.getUserId(context);
+        WorkCopyDto workCopyDto = new WorkCopyDto();
+        workCopyDto.setCopyId(reqJson.getString("copyId"));
+        workCopyDto.setState(WorkPoolDto.STATE_DOING);
+        workCopyDto.setStaffId(userId);
+        List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto);
+
+        if (ListUtil.isNull(workCopyDtos)) {
+            throw new CmdException("抄送单不存在");
+        }
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        WorkCopyPo workCopyPo = new WorkCopyPo();
+        workCopyPo.setCopyId(reqJson.getString("copyId"));
+        workCopyPo.setState(WorkPoolDto.STATE_COMPLETE);
+        workCopyPo.setRemark(reqJson.getString("auditMessage"));
+        workCopyV1InnerServiceSMOImpl.updateWorkCopy(workCopyPo);
+    }
+}

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

@@ -21,14 +21,20 @@ import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.file.FileRelDto;
 import com.java110.intf.oa.IWorkPoolFileV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
+import com.java110.vo.api.machineRecord.ApiMachineRecordDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.workPoolFile.WorkPoolFileDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -48,7 +54,7 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "work.listWorkPoolFile")
 public class ListWorkPoolFileCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListWorkPoolFileCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListWorkPoolFileCmd.class);
     @Autowired
     private IWorkPoolFileV1InnerServiceSMO workPoolFileV1InnerServiceSMOImpl;
 
@@ -56,28 +62,34 @@ public class ListWorkPoolFileCmd extends Cmd {
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
         String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
-        reqJson.put("storeId",storeId);
+        reqJson.put("storeId", storeId);
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           WorkPoolFileDto workPoolFileDto = BeanConvertUtil.covertBean(reqJson, WorkPoolFileDto.class);
+        WorkPoolFileDto workPoolFileDto = BeanConvertUtil.covertBean(reqJson, WorkPoolFileDto.class);
+
+        int count = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFilesCount(workPoolFileDto);
+
+        List<WorkPoolFileDto> workPoolFileDtos = null;
 
-           int count = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFilesCount(workPoolFileDto);
+        if (count > 0) {
+            workPoolFileDtos = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFiles(workPoolFileDto);
+        } else {
+            workPoolFileDtos = new ArrayList<>();
+        }
 
-           List<WorkPoolFileDto> workPoolFileDtos = null;
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
 
-           if (count > 0) {
-               workPoolFileDtos = workPoolFileV1InnerServiceSMOImpl.queryWorkPoolFiles(workPoolFileDto);
-           } else {
-               workPoolFileDtos = new ArrayList<>();
-           }
+        for (WorkPoolFileDto tmpWorkPoolFileDto : workPoolFileDtos) {
+            tmpWorkPoolFileDto.setPathUrl(imgUrl + tmpWorkPoolFileDto.getPathUrl());
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workPoolFileDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workPoolFileDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }