Browse Source

新增人员评分列表

anderx 1 year ago
parent
commit
376f85db68

+ 5 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1360,7 +1360,7 @@
     <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
         select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.delete_sign deleteSign,
         a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.tag,
-        a.contract_picture_url contractPictureUrl,
+        a.contract_picture_url contractPictureUrl,a.score_status scoreStatus,
         a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,c.project_type projectType,
         dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,
         a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName,c.stop_project stopProject,toa.type,toa.type_explain typeExplain
@@ -1445,8 +1445,12 @@
             <if test="approval ==null">
                 and a.approval in(0,1,2,4,5,7,8)
             </if>
+            <if test="scoreStatus !=null">
+                and a.score_status = #{scoreStatus}
+            </if>
             and a.order_status  in(0,1,2,4)
             and a.salesman_id = #{aid,jdbcType=VARCHAR}
+
         </if>
         <if test="specially == 10">
             and a.process_status = 1  and a.order_status in (0,1,2)

+ 3 - 0
src/main/java/com/goafanti/common/model/TaskScore.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -114,6 +116,7 @@ public class TaskScore implements Serializable {
         this.monthlyReport = monthlyReport;
     }
 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     public Date getCreateTime() {
         return createTime;
     }

+ 9 - 0
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -25,9 +25,18 @@ public class InputOrderNewListBo {
     private Integer projectType;
     private Integer processStatus;
     private Integer tag;
+    private Integer scoreStatus;
     private  Integer pageNo;
     private Integer pageSize;
 
+    public Integer getScoreStatus() {
+        return scoreStatus;
+    }
+
+    public void setScoreStatus(Integer scoreStatus) {
+        this.scoreStatus = scoreStatus;
+    }
+
     public String getType() {
         return type;
     }

+ 1 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -101,6 +101,7 @@ public class TOrderNewBo extends TOrderNew{
 
 	private String type;
 
+
 	public String getTypeExplain() {
 		return typeExplain;
 	}

+ 11 - 0
src/main/java/com/goafanti/order/controller/TaskScoreController.java

@@ -52,6 +52,17 @@ public class TaskScoreController extends BaseController {
         return new Result<>().data(this.taskScoreService.queryById(id));
     }
 
+    /**
+     * 通过项目编号获取项目评分
+     *
+     * @param tid 主键
+     * @return 单条数据
+     */
+    @GetMapping("/queryByTid")
+    public Result<TaskScore> queryByTid(Integer tid) {
+        return new Result<>().data(this.taskScoreService.queryByTid(tid));
+    }
+
 
     /**
      * 编辑数据

+ 2 - 0
src/main/java/com/goafanti/order/service/TaskScoreService.java

@@ -55,4 +55,6 @@ public interface TaskScoreService {
     Object updateByTid(TaskScore taskScore);
 
     void updateTOrderNewByTid(Integer tid);
+
+    TaskScore queryByTid(Integer tid);
 }

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1276,6 +1276,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}
 		params.put("outsource", in.getOutsource());
+		params.put("scoreStatus", in.getScoreStatus());
 		return null;
 	}
 

+ 5 - 0
src/main/java/com/goafanti/order/service/impl/TaskScoreServiceImpl.java

@@ -201,4 +201,9 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
         tOrderNewMapper.update(tOrderNew);
     }
 
+    @Override
+    public TaskScore queryByTid(Integer tid) {
+        return taskScoreMapper.queryByTid(tid);
+    }
+
 }

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-#static.host=//static.jishutao.com/1.3.25
-static.host=//172.16.1.187/1.3.25
+static.host=//static.jishutao.com/1.3.25
+#static.host=//172.16.1.187/1.3.25
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false