Explorar o código

抄送我的工单查看

wuxw %!s(int64=2) %!d(string=hai) anos
pai
achega
06a85835fd

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

@@ -24,6 +24,7 @@ public class WorkCopyDto extends PageDto implements Serializable {
     private String copyId;
     private String staffName;
     private String state;
+    private String stateName;
     private String communityId;
     private String storeId;
     private String workId;
@@ -116,4 +117,12 @@ public class WorkCopyDto extends PageDto implements Serializable {
     public void setWorkIds(String[] workIds) {
         this.workIds = workIds;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

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

@@ -19,8 +19,9 @@
     <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
+        workId,t.staff_id,t.staff_id staffId,t.create_time createTime,td.`name` stateName
         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
         <if test="copyId !=null and copyId != ''">
             and t.copy_id= #{copyId}

+ 1 - 1
service-oa/src/main/java/com/java110/oa/cmd/workCopy/ListWorkCopyCmd.java

@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "workCopy.listWorkCopy")
+@Java110Cmd(serviceCode = "work.listWorkCopy")
 public class ListWorkCopyCmd extends Cmd {
 
   private static Logger logger = LoggerFactory.getLogger(ListWorkCopyCmd.class);

+ 2 - 2
service-oa/src/main/java/com/java110/oa/dao/impl/WorkCopyV1ServiceDaoImpl.java

@@ -71,9 +71,9 @@ public class WorkCopyV1ServiceDaoImpl extends BaseServiceDao implements IWorkCop
     public List<Map> getWorkCopyInfo(Map info) throws DAOException {
         logger.debug("查询 getWorkCopyInfo 入参 info : {}",info);
 
-        List<Map> businessWorkCopyInfos = sqlSessionTemplate.selectList("workCopyV1ServiceDaoImpl.getWorkCopyInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("workCopyV1ServiceDaoImpl.getWorkCopyInfo",info);
 
-        return businessWorkCopyInfos;
+        return infos;
     }