Browse Source

变更会员与审计年限处理

anderx 3 years ago
parent
commit
4a0f96eece

+ 1 - 0
src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java

@@ -50,4 +50,5 @@ public interface BusinessProjectMapper {
 
     List<Map> selectProjectAndTypeAll();
 
+
 }

+ 3 - 1
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -32,7 +32,9 @@ public interface TChangeTaskMapper {
      * @param type 处理类型
      * @return
      */
-    int updateByTid(@Param("tid")Integer tid,@Param("sid")Integer sid,@Param("cid")Integer cid,@Param("type")Integer type);
+    int updateByTid(@Param("tid")Integer tid,@Param("sid")Integer sid,@Param("cid")Integer cid,@Param("type")Integer type,@Param("member") Integer member);
+
+
 
     int deleteByTid(Integer tid);
 

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

@@ -573,4 +573,5 @@
     </select>
 
 
+
 </mapper>

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

@@ -381,7 +381,15 @@
   	 and a.cid= #{id} order by a.id
   </select>
     <update id="updateByTid">
-  		update t_change_task set type= #{type},service_life=null,year_sum=null
+  		update t_change_task
+      <set>
+      <if test="type != null">
+        type= #{type},
+      </if>
+      <if test="member ==1">
+        service_life=null,year_sum=null,
+      </if>
+      </set>
   		where 1=1
   		<if test="tid !=null">
   		and tid= #{tid}

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

@@ -816,11 +816,12 @@
            a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
            a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,
            a.split_status splitStatus,a.split_super splitSuper,a.split_aid splitAid,a.split_time splitTime,a.patent_type patentType,ttm.contract_term contractTerm,
-           a.picture_url pictureUrl, ttm.service_life serviceLife ,ttm.service_year serviceYear,ttm.year_sum yearSum
+           a.picture_url pictureUrl, ttm.service_life serviceLife ,ttm.service_year serviceYear,ttm.year_sum yearSum,
+            tm.last_year lastYear,tm.last_year_capital lastYearCapital,tm.last_year_income lastYearIncome
     from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
     left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
     left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
-    left join t_task_member ttm on a.id=ttm.tid
+    left join t_task_member ttm on a.id=ttm.tid left join t_task_mid tm on a.id=tm.tid
     where a.super_id is null   and  a.order_no= #{orderNo,jdbcType=VARCHAR}
     <if test="splitStatus !=null">
       <if test="splitStatus  &lt; 3">

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

@@ -6,7 +6,7 @@ import java.util.Date;
 
 /**
  * business_project
- * @author 
+ * @author
  */
 public class BusinessProject implements Serializable {
     /**
@@ -140,7 +140,7 @@ public class BusinessProject implements Serializable {
     private BigDecimal firstPayment;
 
     /**
-     * 0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+     * 0 正常 1专利 2软著 3审计 4双软 5高新 6商标 7会员
      */
     private Integer type;
 
@@ -490,4 +490,4 @@ public class BusinessProject implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
+}

+ 13 - 7
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -77,7 +77,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderExamineMapper	orderExamineMapper;
 	@Autowired
-	private OrderService	orderService;
+	private BusinessProjectMapper	businessProjectMapper;
 	@Autowired
 	private NewOrderDunMapper	newOrderDunMapper;
 	@Autowired
@@ -166,10 +166,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				ck.setReceiverName(tt.getReceiverName());
 				ck.setMain(tt.getMain());
 				ck.setTid(tt.getId());
-				if(tt.getServiceLife()!=null)	ck.setServiceLife(tt.getServiceLife());
+				if(tt.getServiceLife()!=null)ck.setServiceLife(tt.getServiceLife());
 				if(tt.getServiceYear()!=null)		ck.setServiceYear(tt.getServiceYear());
 				if(tt.getYearSum()!=null)	ck.setYearSum(tt.getYearSum());
 				if(tt.getContractTerm()!=null)	ck.setContractTerm(tt.getContractTerm());
+				if(tt.getLastYear()!=null)	ck.setContractTerm(tt.getLastYear());
+				if(tt.getLastYearCapital()!=null)	ck.setLastYearCapital(tt.getLastYearCapital());
+				if(tt.getLastYearIncome()!=null)	ck.setLastYearIncome(tt.getLastYearIncome());
 				listck.add(ck);
 			}
 			tChangeTaskMapper.insertSelectiveList(listck);
@@ -1082,9 +1085,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if(t.getTid()!=null) {
 					//type 0正常 1新增 2修改 3删除
 					TChangeTask tt=tChangeTaskMapper.selectByPrimaryKey(t.getId());
+					BusinessProject bp = businessProjectMapper.selectByPrimaryKey(tt.getCommodityId());
+					Integer member=null;
 					if (t.getType()==3) {
 						//删除首先将项目删除,然后将所属催款做删除
-						tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),3);
+						if (bp.getType()==7)member=1;
+						tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),3,member);
 						if (tt.getSplitStatus()==0) {
 							tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
 						}else if (tt.getSplitStatus()==1) {
@@ -1092,7 +1098,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							if (tt.getType()==1){
 								tChangeTaskMapper.deleteByChangeSplitSuper(tt.getTid());
 							}else {
-								tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3);
+								tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3,member);
 								tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
 							}
 						}else if(tt.getSplitStatus()==2) {
@@ -1106,19 +1112,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							}
 							if (flag) {
 								//如果所有子类删除判断删除父类
-								tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),3);
+								tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),3,member);
 								tChangeDunMapper.updateByTid(tt.getSplitSuper(),tt.getCid(),3);
 							}
 						}
 					}else if(t.getType()==2){
-						tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),2);
+						tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),2,member);
 						if (tt.getSplitStatus()==1) {
 							if (t.getServiceLife()!=null||t.getServiceYear()!=null||t.getYearSum()!=null||t.getContractTerm()!=null){
 								tChangeTaskMapper.updateMemberByTid(tt.getTid(),t.getCid(),null,t.getServiceLife(),t.getServiceYear(),t.getYearSum(),t.getContractTerm());
 							}
 							updateChangeType(tt);
 						}else if(tt.getSplitStatus()==2) {
-								tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),2);
+								tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),2,member);
 						}
 					}
 					//如果没有tid是新增项目则直接删除