java110-bean/src/main/java/com/java110/dto/workCopy/WorkCopyDto.java
@@ -1,6 +1,7 @@ package com.java110.dto.workCopy; import com.java110.dto.PageDto; import java.io.Serializable; import java.util.Date; @@ -15,12 +16,13 @@ public class WorkCopyDto extends PageDto implements Serializable { private String copyId; private String staffName; private String state; private String communityId; private String storeId; private String workId; private String staffId; private String staffName; private String state; private String communityId; private String storeId; private String workId; private String[] workIds; private String staffId; private Date createTime; @@ -31,43 +33,56 @@ public String getCopyId() { return copyId; } public void setCopyId(String copyId) { public void setCopyId(String copyId) { this.copyId = copyId; } public String getStaffName() { public String getStaffName() { return staffName; } public void setStaffName(String staffName) { public void setStaffName(String staffName) { this.staffName = staffName; } 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 getStoreId() { public String getStoreId() { return storeId; } public void setStoreId(String storeId) { public void setStoreId(String storeId) { this.storeId = storeId; } public String getWorkId() { public String getWorkId() { return workId; } public void setWorkId(String workId) { public void setWorkId(String workId) { this.workId = workId; } public String getStaffId() { public String getStaffId() { return staffId; } public void setStaffId(String staffId) { public void setStaffId(String staffId) { this.staffId = staffId; } @@ -87,4 +102,12 @@ public void setStatusCd(String statusCd) { this.statusCd = statusCd; } public String[] getWorkIds() { return workIds; } public void setWorkIds(String[] workIds) { this.workIds = workIds; } } java110-bean/src/main/java/com/java110/dto/workPool/WorkPoolDto.java
@@ -1,6 +1,7 @@ package com.java110.dto.workPool; import com.java110.dto.PageDto; import java.io.Serializable; import java.util.Date; @@ -15,17 +16,21 @@ public class WorkPoolDto extends PageDto implements Serializable { private String workCycle; private String createUserId; private String createUserName; private String storeId; private String workName; private String workId; private String wtId; private String createUserTel; private String startTime; private String endTime; private String state; private String communityId; private String createUserId; private String createUserName; private String storeId; private String workName; private String workId; private String wtId; private String createUserTel; private String startTime; private String endTime; private String state; private String communityId; private String curStaffName; private String curCopyName; private Date createTime; @@ -36,73 +41,96 @@ public String getWorkCycle() { return workCycle; } public void setWorkCycle(String workCycle) { public void setWorkCycle(String workCycle) { this.workCycle = workCycle; } public String getCreateUserId() { public String getCreateUserId() { return createUserId; } public void setCreateUserId(String createUserId) { public void setCreateUserId(String createUserId) { this.createUserId = createUserId; } public String getCreateUserName() { public String getCreateUserName() { return createUserName; } public void setCreateUserName(String createUserName) { public void setCreateUserName(String createUserName) { this.createUserName = createUserName; } public String getStoreId() { public String getStoreId() { return storeId; } public void setStoreId(String storeId) { public void setStoreId(String storeId) { this.storeId = storeId; } public String getWorkName() { public String getWorkName() { return workName; } public void setWorkName(String workName) { public void setWorkName(String workName) { this.workName = workName; } public String getWorkId() { public String getWorkId() { return workId; } public void setWorkId(String workId) { public void setWorkId(String workId) { this.workId = workId; } public String getWtId() { public String getWtId() { return wtId; } public void setWtId(String wtId) { public void setWtId(String wtId) { this.wtId = wtId; } public String getCreateUserTel() { public String getCreateUserTel() { return createUserTel; } public void setCreateUserTel(String createUserTel) { public void setCreateUserTel(String createUserTel) { this.createUserTel = createUserTel; } public String getStartTime() { public String getStartTime() { return startTime; } public void setStartTime(String startTime) { public void setStartTime(String startTime) { this.startTime = startTime; } public String getEndTime() { public String getEndTime() { return endTime; } public void setEndTime(String endTime) { public void setEndTime(String endTime) { this.endTime = endTime; } 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; } @@ -122,4 +150,20 @@ public void setStatusCd(String statusCd) { this.statusCd = statusCd; } public String getCurStaffName() { return curStaffName; } public void setCurStaffName(String curStaffName) { this.curStaffName = curStaffName; } public String getCurCopyName() { return curCopyName; } public void setCurCopyName(String curCopyName) { this.curCopyName = curCopyName; } } java110-bean/src/main/java/com/java110/dto/workTask/WorkTaskDto.java
@@ -1,6 +1,7 @@ package com.java110.dto.workTask; import com.java110.dto.PageDto; import java.io.Serializable; import java.util.Date; @@ -14,15 +15,19 @@ **/ public class WorkTaskDto extends PageDto implements Serializable { public static final String STATE_DOING = "D";// 处理中 public static final String STATE_COMPLETE = "C";// 处理完成 private String staffName; private String startTime; private String state; private String endTime; private String communityId; private String storeId; private String taskId; private String workId; private String staffId; private String startTime; private String state; private String endTime; private String communityId; private String storeId; private String taskId; private String workId; private String[] workIds; private String staffId; private Date createTime; @@ -33,55 +38,72 @@ public String getStaffName() { return staffName; } public void setStaffName(String staffName) { public void setStaffName(String staffName) { this.staffName = staffName; } public String getStartTime() { public String getStartTime() { return startTime; } public void setStartTime(String startTime) { public void setStartTime(String startTime) { this.startTime = startTime; } public String getState() { public String getState() { return state; } public void setState(String state) { public void setState(String state) { this.state = state; } public String getEndTime() { public String getEndTime() { return endTime; } public void setEndTime(String endTime) { public void setEndTime(String endTime) { this.endTime = endTime; } public String getCommunityId() { public String getCommunityId() { return communityId; } public void setCommunityId(String communityId) { public void setCommunityId(String communityId) { this.communityId = communityId; } public String getStoreId() { public String getStoreId() { return storeId; } public void setStoreId(String storeId) { public void setStoreId(String storeId) { this.storeId = storeId; } public String getTaskId() { public String getTaskId() { return taskId; } public void setTaskId(String taskId) { public void setTaskId(String taskId) { this.taskId = taskId; } public String getWorkId() { public String getWorkId() { return workId; } public void setWorkId(String workId) { public void setWorkId(String workId) { this.workId = workId; } public String getStaffId() { public String getStaffId() { return staffId; } public void setStaffId(String staffId) { public void setStaffId(String staffId) { this.staffId = staffId; } @@ -101,4 +123,12 @@ public void setStatusCd(String statusCd) { this.statusCd = statusCd; } public String[] getWorkIds() { return workIds; } public void setWorkIds(String[] workIds) { this.workIds = workIds; } } 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 workId,t.staff_id,t.staff_id staffId,t.create_time createTime from work_copy t where 1 =1 <if test="copyId !=null and copyId != ''"> @@ -43,9 +43,16 @@ <if test="workId !=null and workId != ''"> and t.work_id= #{workId} </if> <if test="workIds !=null "> and t.work_id in <foreach collection="workIds" item="item" open="(" close=")" separator=","> #{item} </foreach> </if> <if test="staffId !=null and staffId != ''"> and t.staff_id= #{staffId} </if> order by t.create_time desc <if test="page != -1 and page != null "> limit #{page}, #{row} @@ -112,6 +119,12 @@ <if test="workId !=null and workId != ''"> and t.work_id= #{workId} </if> <if test="workIds !=null "> and t.work_id in <foreach collection="workIds" item="item" open="(" close=")" separator=","> #{item} </foreach> </if> <if test="staffId !=null and staffId != ''"> and t.staff_id= #{staffId} </if> java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml
@@ -19,7 +19,7 @@ <select id="getWorkTaskInfo" parameterType="Map" resultType="Map"> select t.staff_name,t.staff_name staffName,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.state,t.end_time,t.end_time endTime,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 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 from work_task t where 1 =1 <if test="staffName !=null and staffName != ''"> @@ -48,6 +48,12 @@ </if> <if test="workId !=null and workId != ''"> and t.work_id= #{workId} </if> <if test="workIds !=null "> and t.work_id in <foreach collection="workIds" item="item" open="(" close=")" separator=","> #{item} </foreach> </if> <if test="staffId !=null and staffId != ''"> and t.staff_id= #{staffId} @@ -79,9 +85,6 @@ , t.end_time= #{endTime} </if> <if test="workId !=null and workId != ''"> , t.work_id= #{workId} </if> <if test="staffId !=null and staffId != ''"> , t.staff_id= #{staffId} </if> @@ -94,6 +97,9 @@ </if> <if test="storeId !=null and storeId != ''"> and t.store_id= #{storeId} </if> <if test="workId !=null and workId != ''"> and t.work_id= #{workId} </if> </update> @@ -130,11 +136,18 @@ <if test="workId !=null and workId != ''"> and t.work_id= #{workId} </if> <if test="workIds !=null "> and t.work_id in <foreach collection="workIds" item="item" open="(" close=")" separator=","> #{item} </foreach> </if> <if test="staffId !=null and staffId != ''"> and t.staff_id= #{staffId} </if> </select> </mapper> service-oa/src/main/java/com/java110/oa/cmd/work/DeleteWorkPoolCmd.java
File was renamed from service-oa/src/main/java/com/java110/oa/cmd/workPool/DeleteWorkPoolCmd.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.oa.cmd.workPool; package com.java110.oa.cmd.work; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; @@ -22,7 +22,6 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.intf.oa.IWorkPoolV1InnerServiceSMO; import com.java110.po.workPool.WorkPoolPo; import com.java110.utils.exception.CmdException; @@ -42,7 +41,7 @@ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "workPool.deleteWorkPool") @Java110Cmd(serviceCode = "work.deleteWorkPool") public class DeleteWorkPoolCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(DeleteWorkPoolCmd.class); service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolCmd.java
File was renamed from service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolCmd.java @@ -13,20 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.oa.cmd.workPool; package com.java110.oa.cmd.work; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.annotation.Java110Transactional; 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.core.factory.GenerateCodeFactory; import com.java110.intf.oa.IWorkPoolV1InnerServiceSMO; import com.java110.po.workPool.WorkPoolPo; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +45,7 @@ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "workPool.listWorkPool") @Java110Cmd(serviceCode = "work.listWorkPool") public class ListWorkPoolCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(ListWorkPoolCmd.class); service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolContentCmd.java
File was renamed from service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolContentCmd.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.oa.cmd.workPool; package com.java110.oa.cmd.work; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; @@ -45,7 +45,7 @@ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "workPool.listWorkPoolContent") @Java110Cmd(serviceCode = "work.listWorkPoolContent") public class ListWorkPoolContentCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(ListWorkPoolContentCmd.class); service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkPoolFileCmd.java
File was renamed from service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolFileCmd.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.oa.cmd.workPool; package com.java110.oa.cmd.work; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; @@ -45,7 +45,7 @@ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "workPool.listWorkPoolFile") @Java110Cmd(serviceCode = "work.listWorkPoolFile") public class ListWorkPoolFileCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(ListWorkPoolFileCmd.class); service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java
New file @@ -0,0 +1,140 @@ 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.dto.workTask.WorkTaskDto; import com.java110.intf.oa.IWorkCopyV1InnerServiceSMO; import com.java110.intf.oa.IWorkPoolV1InnerServiceSMO; import com.java110.intf.oa.IWorkTaskV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.ListUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.text.ParseException; import java.util.ArrayList; import java.util.List; /** * 查询我起草的 工作单 */ @Java110Cmd(serviceCode = "work.queryStartWork") public class QueryStartWorkCmd extends Cmd { @Autowired private IWorkPoolV1InnerServiceSMO workPoolV1InnerServiceSMOImpl; @Autowired private IWorkTaskV1InnerServiceSMO workTaskV1InnerServiceSMOImpl; @Autowired private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { super.validatePageInfo(reqJson); String storeId = CmdContextUtils.getStoreId(context); reqJson.put("storeId", storeId); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { WorkPoolDto workPoolDto = BeanConvertUtil.covertBean(reqJson, WorkPoolDto.class); String userId = CmdContextUtils.getUserId(context); workPoolDto.setCreateUserId(userId); int count = workPoolV1InnerServiceSMOImpl.queryWorkPoolsCount(workPoolDto); List<WorkPoolDto> workPoolDtos = null; if (count > 0) { workPoolDtos = workPoolV1InnerServiceSMOImpl.queryWorkPools(workPoolDto); } else { workPoolDtos = new ArrayList<>(); } //todo 查询 处理人 和抄送人 queryTaskAndCopy(workPoolDtos); ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workPoolDtos); ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK); context.setResponseEntity(responseEntity); } private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) { if (ListUtil.isNull(workPoolDtos)) { return; } List<String> workIds = new ArrayList<>(); for (WorkPoolDto workPoolDto : workPoolDtos) { workIds.add(workPoolDto.getWorkId()); } WorkTaskDto workTaskDto = new WorkTaskDto(); workTaskDto.setWorkIds(workIds.toArray(new String[workIds.size()])); List<WorkTaskDto> workTaskDtos = workTaskV1InnerServiceSMOImpl.queryWorkTasks(workTaskDto); String curStaffName = ""; for (WorkPoolDto workPoolDto : workPoolDtos) { curStaffName = ""; for (WorkTaskDto tmpWorkTaskDto : workTaskDtos) { if (!WorkTaskDto.STATE_DOING.equals(tmpWorkTaskDto.getState())) { continue; } if (!workPoolDto.getWorkId().equals(tmpWorkTaskDto.getWorkId())) { continue; } if (curStaffName.split(",").length > 2) { continue; } curStaffName += (tmpWorkTaskDto.getStaffName() + ","); } workPoolDto.setCurStaffName(curStaffName); } WorkCopyDto workCopyDto = new WorkCopyDto(); workCopyDto.setWorkIds(workIds.toArray(new String[workIds.size()])); List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto); String curCopyName = ""; for (WorkPoolDto workPoolDto : workPoolDtos) { curCopyName = ""; for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) { if (!WorkTaskDto.STATE_DOING.equals(tmpWorkCopyDto.getState())) { continue; } if (!workPoolDto.getWorkId().equals(tmpWorkCopyDto.getWorkId())) { continue; } if (curCopyName.split(",").length > 2) { continue; } curCopyName += (tmpWorkCopyDto.getStaffName() + ","); } workPoolDto.setCurCopyName(curCopyName); } } } service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java
File was renamed from service-oa/src/main/java/com/java110/oa/cmd/workPool/SaveWorkPoolCmd.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.oa.cmd.workPool; package com.java110.oa.cmd.work; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; @@ -43,7 +43,7 @@ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "workPool.saveWorkPool") @Java110Cmd(serviceCode = "work.saveWorkPool") public class SaveWorkPoolCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(SaveWorkPoolCmd.class); service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java
File was renamed from service-oa/src/main/java/com/java110/oa/cmd/workPool/UpdateWorkPoolCmd.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.oa.cmd.workPool; package com.java110.oa.cmd.work; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; @@ -22,7 +22,6 @@ import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.core.factory.GenerateCodeFactory; import com.java110.intf.oa.IWorkPoolV1InnerServiceSMO; import com.java110.po.workPool.WorkPoolPo; import com.java110.utils.exception.CmdException; @@ -44,7 +43,7 @@ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "workPool.updateWorkPool") @Java110Cmd(serviceCode = "work.updateWorkPool") public class UpdateWorkPoolCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(UpdateWorkPoolCmd.class);