[feat] 销售管理

客户报价新增任务状态字段
调整客户报价前端页面，设置当前状态整合当前任务名称和审核状态
修改客户报价列表查询方法：新增对任务状态字段字段的赋值，新增根据审核状态进行升序排序

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

@@ -17,6 +17,10 @@ public class SysCustomerQuoteVo extends SysCustomerQuote {
     private String taskId;
     /** 任务名称 */
     private String taskName;
+
+    /** 任务状态 */
+    private String taskStatus;
+
     /** 办理时间 */
     private Date doneTime;
     /** 创建人 */
@@ -102,19 +106,27 @@ public class SysCustomerQuoteVo extends SysCustomerQuote {
         this.keyword = keyword;
     }
 
+    public String getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(String taskStatus) {
+        this.taskStatus = taskStatus;
+    }
+
     @Override
     public String toString() {
-        return "SysCustomerVo{" +
+        return "SysCustomerQuoteVo{" +
                 "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/SysCustomerQuoteServiceImpl.java

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

ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml

@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="keyword != null and keyword != ''"> and ((s.customerCode like concat('%',#{keyword},'%') or s.customerName like concat('%',#{keyword},'%'))</if>
         </where>
-        order by s.create_time desc
+        order by s.audit_status asc ,s.create_time desc
     </select>
     
     <select id="selectSysCustomerQuoteById" parameterType="Long" resultMap="SysCustomerQuoteResult">

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

@@ -142,16 +142,28 @@
                     {field: 'restoreInstanceId',title: '流程恢复实例ID',visible: false},
                     {field: 'instanceTypeName',title: '流程实例类型',visible: false},
                     {field: 'applyUser',title: '申请人ID', 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>'; }
                     },
                     {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',