[feat] 销售管理

客户资料新增任务状态字段
调整客户资料前端页面，设置当前状态整合当前任务名称和审核状态

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerVo.java

@@ -15,6 +15,9 @@ public class SysCustomerVo extends SysCustomer {
     private String taskId;
     /** 任务名称 */
     private String taskName;
+
+    /** 任务状态 */
+    private String taskStatus;
     /** 办理时间 */
     private Date doneTime;
     /** 创建人 */
@@ -103,19 +106,28 @@ public class SysCustomerVo extends SysCustomer {
         this.keyword = keyword;
     }
 
+
+    public String getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(String taskStatus) {
+        this.taskStatus = taskStatus;
+    }
+
     @Override
     public String toString() {
-        return "ErpMaterialVo{" +
+        return "SysCustomerVo{" +
                 "applyUserName='" + applyUserName + '\'' +
                 ", taskId='" + taskId + '\'' +
                 ", taskName='" + taskName + '\'' +
+                ", taskStatus='" + taskStatus + '\'' +
                 ", doneTime=" + doneTime +
                 ", createUserName='" + createUserName + '\'' +
                 ", suspendState='" + suspendState + '\'' +
                 ", todoUserId='" + todoUserId + '\'' +
                 ", instanceTypeName='" + instanceTypeName + '\'' +
                 ", keyword='" + keyword + '\'' +
-                "} " + super.toString();
+                '}';
     }
-
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java

@@ -138,6 +138,15 @@ public class SysCustomerServiceImpl implements ISysCustomerService
             } else {
                 sysCustomerVo.setTaskName("未启动");
             }
+            sysCustomerVo.setTaskStatus(sysCustomerVo.getTaskName());
+            if(sysCustomerVo.getAuditStatus()!=null){
+                if(sysCustomerVo.getAuditStatus().equals("1")){
+                    sysCustomerVo.setTaskStatus("审核通过");
+                }else if(sysCustomerVo.getAuditStatus().equals("2")){
+                    sysCustomerVo.setTaskStatus("审核拒绝");
+                }
+            }
+
             returnList.add(sysCustomerVo);
         }
         returnList.setTotal(CollectionUtils.isEmpty(list) ? 0 : list.getTotal());

ruoyi-admin/src/main/resources/templates/system/customer/customer.html

@@ -466,6 +466,18 @@
                 {title: '流程恢复实例ID',field: 'restoreInstanceId', visible: false},
                 {title: '流程实例类型',field: 'instanceTypeName',visible: false},
                 { title: '申请人ID',field: 'applyUser',visible: false},
+
+                {title: '当前状态',field: 'taskStatus',align: 'center',
+                    formatter: function(value, row, index) {
+                        if(row.auditStatus!="1"&&value != "未启动"){
+                            return '<span class="badge badge-danger">' + value + '</span>';
+                        }
+                        if(value === "未启动"){
+                            return '<span class="badge badge-primary">' + value + '</span>';
+                        }
+                        return '<span class="badge badge-primary">' + value + '</span>';}
+                },
+
                 {field: 'applyUserName', title: '<span style="color: red;">申请人</span>',
                     formatter: function(value, row, index) {
                         return '<span style="color: red;">' + (value ? value : "-") + '</span>';
@@ -474,12 +486,12 @@
                 {field: 'applyTime',title: '申请时间'},
                 {field: 'taskId',title: '当前任务ID',visible: false},
                 {field: 'todoUserId', title: '待办用户ID',visible: false},
-                {field: 'taskName',title: '当前任务名称',align: 'center',
+                {field: 'taskName',title: '当前任务名称',align: 'center', visible: false,
                     formatter: function(value, row, index) {
                         return '<span class="badge badge-primary">' + value + '</span>';
                     }
                 },
-                { title: '审核状态',field: 'auditStatus',
+                { title: '审核状态',field: 'auditStatus', visible: false,
                     formatter: function (value, row, index) { return $.table.selectDictLabel(auditStatusDatas, value);}
                 },
                 {title: '客户状态',field: 'useStatus',