瀏覽代碼

Merge branch 'test' of jishutao/kede-server into prod

gitadmin 1 月之前
父節點
當前提交
cd97d85ebb
共有 23 個文件被更改,包括 1333 次插入959 次删除
  1. 942 892
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml
  2. 2 2
      src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml
  3. 70 11
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  4. 16 2
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  5. 53 3
      src/main/java/com/goafanti/common/model/NewOrderChange.java
  6. 4 0
      src/main/java/com/goafanti/common/model/PublicReleaseClock.java
  7. 51 3
      src/main/java/com/goafanti/common/model/TOrderNew.java
  8. 30 26
      src/main/java/com/goafanti/common/task/OrderDunTask.java
  9. 3 3
      src/main/java/com/goafanti/common/utils/FileUtils.java
  10. 24 0
      src/main/java/com/goafanti/order/bo/InputProjectStatistics.java
  11. 37 0
      src/main/java/com/goafanti/order/bo/OutProjectStatistics.java
  12. 34 0
      src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java
  13. 22 1
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  14. 1 1
      src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
  15. 3 1
      src/main/java/com/goafanti/order/service/OrderNewService.java
  16. 17 0
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  17. 6 1
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  18. 1 0
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  19. 1 2
      src/main/java/com/goafanti/order/service/impl/ProjectDistributionAsyncService.java
  20. 2 0
      src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java
  21. 7 4
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java
  22. 6 6
      src/main/resources/props/config_local.properties
  23. 1 1
      src/main/resources/props/config_test.properties

文件差異過大導致無法顯示
+ 942 - 892
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml


+ 2 - 2
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -462,8 +462,8 @@
   </select>
   <select id="selectAllOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
     select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay,
-     a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval,a.customize_time customizeTime,
-    date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName,a.money ,c.project_type memberType
+           a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval,a.customize_time customizeTime,
+           date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName,a.money ,c.project_type memberType
     from new_order_dun a left join  t_order_new b on a.order_no=b.order_no left join t_order_mid c on a.order_no =c.order_no
     where 1=1 and a.status=0 and b.process_status &gt; 4 and b.delete_sign in (0,2,3)
   </select>

文件差異過大導致無法顯示
+ 70 - 11
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml


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

@@ -1944,7 +1944,8 @@
             a.cost_reduction costReduction,  a.official_cost officialCost,a.set_up_status setUpStatus ,date_format(a.set_up_time,'%Y-%m-%d') setUpTime ,a.high_tech_status highTechStatus ,
             a.spot_check_status spotCheckStatus , a.special_comment specialComment ,ttm.certificates_count certificatesCount ,ttm.reject_count rejectCount ,a.check_status checkStatus,
             ttm.authorize_count authorizeCount ,ttm.end_count endCount,ttm.accept_count acceptCount,a.commodity_price  commodityPrice,a.commodity_quantity commodityQuantity,
-            a.satisfaction_degree satisfactionDegree,a.satisfaction_degree_url satisfactionDegreeUrl
+            a.satisfaction_degree satisfactionDegree,a.satisfaction_degree_url satisfactionDegreeUrl,
+            e.nda ,e.nda_url ndaUrl,e.breach_clause breachClause,e.breach_clause_url breachClauseUrl
         from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
                             left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
                             left join department h on e.order_dep=h.id left join user f on e.buyer_id=f.id LEFT JOIN t_task_mid ttm ON a.id=ttm.tid
@@ -2246,7 +2247,8 @@
         tm.service_life serviceLife,tm.service_year serviceyear, tm.year_sum yearsum,tm.contract_term contractTerm, a.commodity_price commodityPrice ,
         a.special_comment specialComment,a.task_comment taskComment,ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,
         e.service_type serviceType,e.service_project serviceProject, a.form_retrieve formRetrieve  ,a.satisfaction_degree satisfactionDegree,
-        toa.type,toa.type_explain typeExplain,b.approval,a.score_status scoreStatus ,a.score_number scoreNumber,ts.create_time scoreTime
+        toa.type,toa.type_explain typeExplain,b.approval,a.score_status scoreStatus ,a.score_number scoreNumber,ts.create_time scoreTime,
+        b.nda ,b.nda_url ndaUrl,b.breach_clause breachClause , b.breach_clause_url breachClauseUrl
         from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id
         left join district_glossory d on c.province=d.id left join task_progress tp  on a.id=tp.task_id left join t_task_member tm on a.id=tm.tid
         left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id
@@ -2381,6 +2383,12 @@
         <if test=" projectAmount == 9">
             and a.commodity_price &gt;=  #{amountStart}
         </if>
+        <if test="nda !=null">
+            and b.nda = #{nda}
+        </if>
+        <if test="breachClause !=null">
+            and b.breach_clause = #{breachClause}
+        </if>
         <if test="page_sql!=null">
             ${page_sql}
         </if>
@@ -2533,6 +2541,12 @@
         <if test=" projectAmount == 9">
             and a.commodity_price &gt;=  #{amountStart}
         </if>
+        <if test="nda !=null">
+            and b.nda = #{nda}
+        </if>
+        <if test="breachClause !=null">
+            and b.breach_clause = #{breachClause}
+        </if>
     </select>
 
     <select id="selectProvincialStatisticsListByPage" resultType="com.goafanti.order.bo.OutProvincialStatistics">

+ 53 - 3
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -4,14 +4,15 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.io.Serializable;
 
+
 /**
  * 订单变更(NewOrderChange)实体类
  *
- * @author andex
- * @since 2023-11-27 13:46:34
+ * @author makejava
+ * @since 2025-12-11 13:44:38
  */
 public class NewOrderChange implements Serializable {
-    private static final long serialVersionUID = -19111689813792568L;
+    private static final long serialVersionUID = 749039204953634313L;
     /**
      * id
      */
@@ -172,6 +173,22 @@ public class NewOrderChange implements Serializable {
      * 总经理联系电话
      */
     private String managerContactMobile;
+    /**
+     * 是否签订保密协议:0=无,1=有
+     */
+    private Integer nda;
+    /**
+     * 保密协议地址
+     */
+    private String ndaUrl;
+    /**
+     * 是否有违约条件:0=无,1=有,有限责任违约条款、与技术服务有关,2=有,有限责任违约条款、与技术服务无有关,3=有,无限责任违约条款、与技术服务无有关,4=有,无限责任违约条款、与技术服务有关
+     */
+    private Integer breachClause;
+    /**
+     * 违约条款地址
+     */
+    private String breachClauseUrl;
 
 
     public Integer getId() {
@@ -494,4 +511,37 @@ public class NewOrderChange implements Serializable {
         this.managerContactMobile = managerContactMobile;
     }
 
+    public Integer getNda() {
+        return nda;
+    }
+
+    public void setNda(Integer nda) {
+        this.nda = nda;
+    }
+
+    public String getNdaUrl() {
+        return ndaUrl;
+    }
+
+    public void setNdaUrl(String ndaUrl) {
+        this.ndaUrl = ndaUrl;
+    }
+
+    public Integer getBreachClause() {
+        return breachClause;
+    }
+
+    public void setBreachClause(Integer breachClause) {
+        this.breachClause = breachClause;
+    }
+
+    public String getBreachClauseUrl() {
+        return breachClauseUrl;
+    }
+
+    public void setBreachClauseUrl(String breachClauseUrl) {
+        this.breachClauseUrl = breachClauseUrl;
+    }
+
 }
+

+ 4 - 0
src/main/java/com/goafanti/common/model/PublicReleaseClock.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -80,6 +82,8 @@ public class PublicReleaseClock implements Serializable {
         this.photoUrl = photoUrl;
     }
 
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     public Date getClockInTime() {
         return clockInTime;
     }

+ 51 - 3
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -1,18 +1,18 @@
 package com.goafanti.common.model;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.io.Serializable;
 
 
 /**
  * 订单表(TOrderNew)实体类
  *
  * @author makejava
- * @since 2025-07-21 10:45:15
+ * @since 2025-12-11 10:46:08
  */
 public class TOrderNew implements Serializable {
-    private static final long serialVersionUID = -96001184610112478L;
+    private static final long serialVersionUID = -83400857385657708L;
     /**
      * 订单编号
      */
@@ -218,6 +218,22 @@ public class TOrderNew implements Serializable {
      * 新购客户 0=是,1=否(未签单或者三年内未签单为新)
      */
     private Integer newSignUser;
+    /**
+     * 是否签订保密协议:0=无,1=有
+     */
+    private Integer nda;
+    /**
+     * 保密协议地址
+     */
+    private String ndaUrl;
+    /**
+     * 是否有违约条件:0=无,1=有,有限责任违约条款、与技术服务有关,2=有,有限责任违约条款、与技术服务无有关,3=有,无限责任违约条款、与技术服务无有关,4=有,无限责任违约条款、与技术服务有关
+     */
+    private Integer breachClause;
+    /**
+     * 违约条款地址
+     */
+    private String breachClauseUrl;
 
 
     public String getOrderNo() {
@@ -628,5 +644,37 @@ public class TOrderNew implements Serializable {
         this.newSignUser = newSignUser;
     }
 
+    public Integer getNda() {
+        return nda;
+    }
+
+    public void setNda(Integer nda) {
+        this.nda = nda;
+    }
+
+    public String getNdaUrl() {
+        return ndaUrl;
+    }
+
+    public void setNdaUrl(String ndaUrl) {
+        this.ndaUrl = ndaUrl;
+    }
+
+    public Integer getBreachClause() {
+        return breachClause;
+    }
+
+    public void setBreachClause(Integer breachClause) {
+        this.breachClause = breachClause;
+    }
+
+    public String getBreachClauseUrl() {
+        return breachClauseUrl;
+    }
+
+    public void setBreachClauseUrl(String breachClauseUrl) {
+        this.breachClauseUrl = breachClauseUrl;
+    }
+
 }
 

+ 30 - 26
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -48,8 +48,6 @@ public class OrderDunTask {
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
 	@Autowired
-	private AdminMapper adminMapper;
-	@Autowired
 	private PaymentNodeMapper	paymentNodeMapper;
 	@Autowired
 	private OrderProjectService	orderProjectService;
@@ -79,6 +77,33 @@ public class OrderDunTask {
 //		pushLegalAffairs();
 	}
 
+
+	/**
+	 * 	每月1号凌晨4点轮询处理需要欠款催款的信息
+	 *
+	 */
+	@Scheduled(cron = "0 0 4 1 * ?")
+//	@Scheduled(cron = "0 33 9 * * ?")
+//	@RequestMapping(value = "/open/pushOrderArrearsDun", method = RequestMethod.GET)
+	public void pushOrderArrearsDun() {
+		try {
+			LoggerUtils.debug(logger, "======================欠款催款启动===================");
+			Date date = new Date();
+
+			List<TArrearsDun> list = tArrearsDunMapper.selectStatusAll(0);
+			List<TArrearsDun> list2 = tArrearsDunMapper.selectStatusAll(1);
+			List<TArrearsDun> list3 = tArrearsDunMapper.selectStatusAndAmount(2);
+
+			processList(list, date);
+			processList(list2, date);
+			processList(list3, date);
+
+			LoggerUtils.debug(getClass(), "===========================欠款催款完成==========================");
+		} catch (Exception e) {
+			LoggerUtils.error(getClass(), "===========================欠款催款失败==========================", e);
+		}
+	}
+
 	/**
 	 * 法务订单催款处理
 	 */
@@ -116,6 +141,7 @@ public class OrderDunTask {
 	public void updateNewOrderDun(){
   		try {
   			LoggerUtils.debug(logger, "======================新催款任务轮询启动===================");
+			  //获取所有新催款在启动切状态达到咨询师管理员的订单
 			List<OutNewOrderDunBo> list= newOrderDunService.selectAllOrderDun();
 			Calendar now=Calendar.getInstance();
 			Calendar create=Calendar.getInstance();
@@ -235,31 +261,7 @@ public class OrderDunTask {
 		}
 	}
 
-	/**
-	* 	每月1号凌晨4点轮询处理需要欠款催款的信息
-	*
-	*/
-	@Scheduled(cron = "0 0 4 1 * ?")
-//	@Scheduled(cron = "0 33 9 * * ?")
-//	@RequestMapping(value = "/open/pushOrderArrearsDun", method = RequestMethod.GET)
-	public void pushOrderArrearsDun() {
-    try {
-        LoggerUtils.debug(logger, "======================欠款催款启动===================");
-        Date date = new Date();
-
-        List<TArrearsDun> list = tArrearsDunMapper.selectStatusAll(0);
-        List<TArrearsDun> list2 = tArrearsDunMapper.selectStatusAll(1);
-        List<TArrearsDun> list3 = tArrearsDunMapper.selectStatusAndAmount(2);
 
-        processList(list, date);
-        processList(list2, date);
-        processList(list3, date);
-
-        LoggerUtils.debug(getClass(), "===========================欠款催款完成==========================");
-    } catch (Exception e) {
-        LoggerUtils.error(getClass(), "===========================欠款催款失败==========================", e);
-    }
-}
 
 private void processList(List<TArrearsDun> tarrearsList, Date date) {
     for (TArrearsDun ta : tarrearsList) {
@@ -369,9 +371,11 @@ private void processList(List<TArrearsDun> tarrearsList, Date date) {
 			TArrearsDun td=new TArrearsDun();
 			td.setOrderArrears(tm.getOrderArrears());
 			td.setOrderReceivables(tm.getOrderReceivables());
+			//如果没有订单的欠款信息则插入
 			if (tArrearsDunMapper.checkOrderNo(t.getOrderNo(),null)<1) {
 				td.setOrderNo(t.getOrderNo());
 				tArrearsDunMapper.insertSelective(td);
+				//如果有则更新
 			}else if(tArrearsDunMapper.checkOrderNo(t.getOrderNo(),0)>0){
 				Integer i=tArrearsDunMapper.selectByStatus(t.getOrderNo(), 0);
 				td.setId(i);

+ 3 - 3
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -137,12 +137,12 @@ public class FileUtils {
 		String fileName = "";
 		if (isPrivate || StringUtils.isNotBlank(sign)) {
 			if (uniq) {
-				fileName = path + uid + "/" + System.nanoTime() + "_" + sign + suffix;
+				fileName = path  + "/" + System.nanoTime() + "_" + sign + suffix;
 			} else {
-				fileName = path + uid + "/" +  sign + suffix;
+				fileName = path  + "/" +  sign + suffix;
 			}
 		} else {
-			fileName = path + uid + "/" + System.nanoTime() + suffix;
+			fileName = path  + "/" + System.nanoTime() + suffix;
 		}
 		return fileName;
 	}

+ 24 - 0
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -40,6 +40,30 @@ public class InputProjectStatistics {
 	 * 0未发放 1已发放 2已回收(非常满意) 3已回收(满意) 4已回收(一般) 5已回收(不满意)
 	 */
 	private Integer sdStatus;
+	/**
+	 * 是否签订保密协议:0=无,1=有
+	 */
+	private Integer nda;
+	/**
+	 * 是否有违约条件:0=无,1=有,有限责任违约条款、与技术服务有关,2=有,有限责任违约条款、与技术服务无有关,3=有,无限责任违约条款、与技术服务无有关,4=有,无限责任违约条款、与技术服务有关
+	 */
+	private Integer breachClause;
+
+	public Integer getNda() {
+		return nda;
+	}
+
+	public void setNda(Integer nda) {
+		this.nda = nda;
+	}
+
+	public Integer getBreachClause() {
+		return breachClause;
+	}
+
+	public void setBreachClause(Integer breachClause) {
+		this.breachClause = breachClause;
+	}
 
 	public String getType() {
 		return type;

+ 37 - 0
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -88,6 +88,43 @@ public class OutProjectStatistics {
 	private Integer scoreNumber;
 	private Date scoreTime;
 
+	private Integer nda;
+	private String ndaUrl;
+	private Integer breachClause;
+	private String breachClauseUrl;
+
+	public Integer getNda() {
+		return nda;
+	}
+
+	public void setNda(Integer nda) {
+		this.nda = nda;
+	}
+
+	public String getNdaUrl() {
+		return ndaUrl;
+	}
+
+	public void setNdaUrl(String ndaUrl) {
+		this.ndaUrl = ndaUrl;
+	}
+
+	public Integer getBreachClause() {
+		return breachClause;
+	}
+
+	public void setBreachClause(Integer breachClause) {
+		this.breachClause = breachClause;
+	}
+
+	public String getBreachClauseUrl() {
+		return breachClauseUrl;
+	}
+
+	public void setBreachClauseUrl(String breachClauseUrl) {
+		this.breachClauseUrl = breachClauseUrl;
+	}
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	public Date getScoreTime() {
 		return scoreTime;

+ 34 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -129,6 +129,40 @@ public class TOrderTaskDetailBo {
 	private Integer satisfactionDegree;
 	private String satisfactionDegreeUrl;
 
+	private Integer nda; private String ndaUrl;private Integer breachClause ; private String breachClauseUrl;
+
+	public Integer getNda() {
+		return nda;
+	}
+
+	public void setNda(Integer nda) {
+		this.nda = nda;
+	}
+
+	public String getNdaUrl() {
+		return ndaUrl;
+	}
+
+	public void setNdaUrl(String ndaUrl) {
+		this.ndaUrl = ndaUrl;
+	}
+
+	public Integer getBreachClause() {
+		return breachClause;
+	}
+
+	public void setBreachClause(Integer breachClause) {
+		this.breachClause = breachClause;
+	}
+
+	public String getBreachClauseUrl() {
+		return breachClauseUrl;
+	}
+
+	public void setBreachClauseUrl(String breachClauseUrl) {
+		this.breachClauseUrl = breachClauseUrl;
+	}
+
 	public Integer getScoreStatus() {
 		return scoreStatus;
 	}

+ 22 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -891,7 +891,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError("只有超级管理员能直接修改"));
 			return res;
 		}
-		return res.data(orderNewService.updateOrderUrl(orderNo,contractPictureUrl,agreementUrl,serviceContent));
+		return res.data(orderNewService.updateOrderAllUrl(orderNo,contractPictureUrl,agreementUrl,serviceContent));
 	}
 
 	/**
@@ -931,5 +931,26 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	}
 
 
+	/**
+	 *  上传订单图片
+	 **/
+	@RequestMapping(value = "/uploadOrderFile", method = RequestMethod.POST)
+	public Result uploadOrderFile(HttpServletRequest req,String sign,String orderNo){
+		Result res = new Result();
+		//sign  nda    breach_clause
+		String path=String.format("/order/%s/%s/", sign, orderNo);
+		String fileUrl = handleFile(res, path, false, req, sign);
+		TOrderNew orderNew = new TOrderNew();
+		orderNew.setOrderNo(orderNo);
+		if (sign.equals("nda")){
+			orderNew.setNdaUrl(fileUrl);
+		}else if (sign.equals("breach_clause")){
+			orderNew.setBreachClauseUrl(fileUrl);
+		}
+		orderNewService.updateOrderUrl(orderNew);
+		res.setData(fileUrl);
+		return res;
+	}
+
 
 }

+ 1 - 1
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -230,7 +230,7 @@ public class OrderChangeApiController extends CertifyApiController {
 
 	/**
 	 * 变更修改、修改变更
-	 * @param changeType 0发起修改 1财务修改
+	 * @param changeType 0发起修改 2财务修改
 	 */
 	@RequestMapping(value = "/updateOrderChange", method = RequestMethod.POST)
 	public Result orderChangeDetails(NewOrderChangeBo t ,Integer changeType,String startRemarks){

+ 3 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -215,7 +215,7 @@ public interface OrderNewService {
 
 	void pushExamineName(TOrderNew t);
 
-    int updateOrderUrl(String orderNo, String contractPictureUrl, String agreementUrl, String serviceContent);
+    int updateOrderAllUrl(String orderNo, String contractPictureUrl, String agreementUrl, String serviceContent);
 
     OrderProcessName getProcessName(String orderNo);
 
@@ -249,4 +249,6 @@ public interface OrderNewService {
     Object updateAddGroupChat(TOrderMid us);
 
     Object pushOrderNewUser();
+
+	void updateOrderUrl(TOrderNew orderNew);
 }

+ 17 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -795,6 +795,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setContactMobile(t.getContactMobile());
 			noc.setManagerContacts(t.getManagerContacts());
 			noc.setManagerContactMobile(t.getManagerContactMobile());
+			noc.setNda(t.getNda());
+			noc.setNdaUrl(t.getNdaUrl());
+			noc.setBreachClause(t.getBreachClause());
+			noc.setBreachClauseUrl(t.getBreachClauseUrl());
 			Date date =new Date();
 			addOrderChangeLog(startRemarks==null?"":startRemarks, 0, t.getOrderNo(), noc.getId(),date);
 			if(t.getType()!=0)chekeAmout(t);
@@ -1088,6 +1092,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}else if (nob.getType()==OrderChangeType.CB.getCode()){
 			o.setTotalAmount(nob.getTotalAmount());
 			if (nob.getFirstAmount()!=null)o.setFirstAmount(nob.getFirstAmount());
+		}else if (nob.getType()==OrderChangeType.JBGGT.getCode()) {
+			if(nob.getNda()!=null){
+				o.setNda(nob.getNda());
+			}
+			if(nob.getBreachClause()!=null){
+				o.setBreachClause(nob.getBreachClause());
+			}
+			if (nob.getNdaUrl()!= null){
+				o.setNdaUrl(nob.getNdaUrl());
+			}
+			if (nob.getBreachClauseUrl()!= null){
+				o.setBreachClauseUrl(nob.getBreachClauseUrl());
+			}
 		}
 		//处理变更项目与催款新增在订单中
 		pushTaskAndDun(nob.getId(),o);

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

@@ -2607,7 +2607,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
-	public int updateOrderUrl(String orderNo, String contractPictureUrl, String agreementUrl, String serviceContent) {
+	public int updateOrderAllUrl(String orderNo, String contractPictureUrl, String agreementUrl, String serviceContent) {
 		TOrderNew t=new TOrderNew();
 		t.setOrderNo(orderNo);
 		t.setContractPictureUrl(contractPictureUrl);
@@ -2742,4 +2742,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return 1;
 	}
 
+	@Override
+	public void updateOrderUrl(TOrderNew orderNew) {
+		tOrderNewMapper.update(orderNew);
+	}
+
 }

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

@@ -184,6 +184,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}
 		t.setReceiverName(a.getName());
 		tOrderTaskMapper.update(t);
+
 		projectDistributionAsyncService.pushProjectDistribution(taskId, taskReceiverId, type, t, tn, date, a);
 		return 1;
 	}

+ 1 - 2
src/main/java/com/goafanti/order/service/impl/ProjectDistributionAsyncService.java

@@ -15,7 +15,6 @@ import com.goafanti.order.service.OrderNewService;
 import com.goafanti.techproject.enums.TaskState;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -65,7 +64,7 @@ public class ProjectDistributionAsyncService {
 
 
 
-    @Transactional
+
     public void pushProjectDistribution(Integer taskId, String taskReceiverId,  Integer type, TOrderTask t, TOrderNew tn, Date date, Admin a) {
         List<String> aids = new ArrayList<>();
         aids.add(taskReceiverId);

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

@@ -92,6 +92,8 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		if(ps.getProjectId()!=null) params.put("projectId", ps.getProjectId());
 		if(ps.getScreen()!=null) params.put("screen", ps.getScreen());
 		if (ps.getSdStatus()!=null)params.put("sdStatus",ps.getSdStatus());
+		if(ps.getNda()!=null)params.put("nda", ps.getNda());
+		if(ps.getBreachClause()!=null)params.put("breachClause", ps.getBreachClause());
 		if(ps.getPageNo()!=null)pageNo=ps.getPageNo();
 		if(ps.getPageSize()!=null)pageSize=ps.getPageSize();
 		Pagination<OutProjectStatistics> p = (Pagination<OutProjectStatistics>)findPage("selectProjectStatisticsListByPage",

+ 7 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -119,11 +119,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		List<PublicReleaseDetails> prdList=new ArrayList<>();
 		List<User> users=new ArrayList<>();
 		StringBuilder str =new StringBuilder();
-		//判定是单独协单还是一起协单
 		in.setAid(TokenManager.getAdminId());
 		in.setAname(my.getName());
+		//判定是单独协单还是一起协单
 		if (in.getAssist()==1){
-//			in.setAssistAidName(getAssistAidName(in.getAssistAid()));
 			in.setMainName(my.getName());
 			in.setAssistProcess(1);
 		}
@@ -659,7 +658,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		addPublicReleaseDateClock(in);
 		publicReleaseLogMapper.insertSelective(log);
 		//设置回不需要审核,理论上按流程变更
-		in.setProcessStatus(0);
+		if(use.getProcessStatus()>0){
+			in.setProcessStatus(1);
+		}else {
+			in.setProcessStatus(0);
+		}
 		publicReleaseMapper.update(in);
 		if (in.getOrderNo()!=null){
 			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
@@ -701,6 +704,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	private void pushUpdatePublic(InputPublicRelease in, List<User> uses, PublicRelease use, PublicReleaseLog log, String userNames, Date date, Map checkOrderNo) {
 		if (in.getUids()!=null){
+			//如果是多企业公出,修改多企业信息
 			List<String> split = Arrays.asList(in.getUids().split(","));
 			List<OutPublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPrid(in.getId());
 			uses =pushPublicReleaseDetails(split,prList, use, in);
@@ -752,7 +756,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				PublicRelease p=new PublicRelease();
 				p.setId(in.getId());
 				p.setAid(aid2);
-				p.setAname(my2.getName());
 				p.setReleaseStart(in.getReleaseStart());
 				p.setReleaseEnd(in.getReleaseEnd());
 				p.setPlan(in.getPlan());

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

@@ -1,19 +1,19 @@
 dev.name=local
 spring.main.lazy-initialization=true
 jdbc.driverClassName=com.mysql.jdbc.Driver
-kede.version=1.3.46
+kede.version=1.3.47
 static.host=//static.jishutao.com/${kede.version}
 #static.host=//172.16.1.199:3000/${kede.version}
 #static.host=//172.16.1.187/${kede.version}
 #avatar.host=//172.16.1.199:3000
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20250313?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
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?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
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
-kede.version=1.3.46
+kede.version=1.3.47
 static.host=//static.jishutao.com/${kede.version}
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver