ソースを参照

项目进度表开发

anderx 1 年間 前
コミット
6487a587ae

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

@@ -1845,7 +1845,7 @@ unilateral_service = values(unilateral_service)
         select
             a.id,a.commodity_name as taskName,a.order_no as orderNo,c.sort ,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
             a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
-            g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
+            g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,a.score_status as scoreStatus,
             a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,a.task_receiver taskReceiver,b.patent_transfer patentTransfer,
             a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,e.contacts ,b.`type` bpType,
             date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,

+ 11 - 2
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -1,10 +1,10 @@
 package com.goafanti.order.bo;
 
-import java.math.BigDecimal;
-
 import com.goafanti.common.enums.OfficialPatentType;
 import com.goafanti.common.utils.StringUtils;
 
+import java.math.BigDecimal;
+
 public class TOrderTaskDetailBo {
 	private Integer id;
 	private String taskName;
@@ -42,6 +42,7 @@ public class TOrderTaskDetailBo {
 	private Integer declarationBatch;
 	private Integer ifCertificationFee;
 	private Integer deleteSign;
+	private Integer scoreStatus;
 	private String certificationCorporate;
 	private BigDecimal certificationFee;
 
@@ -128,6 +129,14 @@ public class TOrderTaskDetailBo {
 	private Integer satisfactionDegree;
 	private String satisfactionDegreeUrl;
 
+	public Integer getScoreStatus() {
+		return scoreStatus;
+	}
+
+	public void setScoreStatus(Integer scoreStatus) {
+		this.scoreStatus = scoreStatus;
+	}
+
 	public Integer getSatisfactionDegree() {
 		return satisfactionDegree;
 	}

+ 21 - 16
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -2127,25 +2127,30 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 						t.setId(e.getId());
 						t.setCompleteStatus(1);
 						if (date !=null)e.setCompleteDate(DateUtils.parseDate(date));
-						if (sort==3||sort==6||sort==9){
-							// 创建一个SimpleDateFormat对象用于解析日期字符串
-							SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-							// 解析字符串"2024-01-01"为Date对象
-							Date targetDate = sdf.parse("2024-01-01");
-							// 使用compareTo方法比较两个日期
-							int result=0;
-							if (e.getTaskDistributionTime()!=null){
-								result = targetDate.compareTo(e.getTaskDistributionTime());
-								//2024-01-01之后派单返回-1
-								if (result <0){
-									t.setScoreStatus(1);
-								}else {
-									t.setScoreStatus(0);
+						//只有带评分和无才需要修改评分状态
+						if (orderTaskDetail.getScoreStatus()==0||orderTaskDetail.getScoreStatus()==1){
+							if (sort==3||sort==6||sort==9){
+								// 创建一个SimpleDateFormat对象用于解析日期字符串
+								SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+								// 解析字符串"2024-01-01"为Date对象
+								Date targetDate = sdf.parse("2024-01-01");
+								// 使用compareTo方法比较两个日期
+								int result=0;
+								if (e.getTaskDistributionTime()!=null){
+									result = targetDate.compareTo(e.getTaskDistributionTime());
+									//2024-01-01之后派单返回-1
+
+									if (result <0){
+										t.setScoreStatus(1);
+									}else {
+										t.setScoreStatus(0);
+									}
 								}
+								tOrderTaskMapper.update(t);
+								taskScoreService.updateTOrderNewByTid(e.getId());
 							}
-							tOrderTaskMapper.update(t);
-							taskScoreService.updateTOrderNewByTid(e.getId());
 						}
+
 				}
 			} catch (JsonProcessingException | ParseException ex) {
 				throw new RuntimeException(ex);