Browse Source

项目会员修改开发

anderx 3 years ago
parent
commit
e2f945430c

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

@@ -14,4 +14,6 @@ public interface TTaskMemberMapper {
     int updateByPrimaryKeySelective(TTaskMember record);
 
     int updateByPrimaryKey(TTaskMember record);
-}
+
+    int updateByTid(TTaskMember ttm);
+}

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

@@ -784,22 +784,19 @@
 
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
     select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,
-           a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
-           e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
-           c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,b.patent_transfer patentTransfer ,
-           i.price,a.certificate_number as certificateNumber, 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.if_certification_fee ifCertificationFee , a.split_status splitStatus,
-           a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
-           a.patent_type patentType,a.picture_url pictureUrl
-    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
+    a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
+    e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
+    c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,b.patent_transfer patentTransfer ,
+    i.price,a.certificate_number as certificateNumber, 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.if_certification_fee ifCertificationFee , a.split_status splitStatus,
+    a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
+    a.patent_type patentType,a.picture_url pictureUrl,j.service_life serviceLife ,j.service_year serviceYear,j.year_sum yearSum
+    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 j on a.id =j.tid
     where a.super_id is null and a.split_status in(0,1)
       <if test="orderNo != null">
       and a.order_no= #{orderNo,jdbcType=VARCHAR}

+ 23 - 4
src/main/java/com/goafanti/common/mapper/TTaskMemberMapper.xml

@@ -13,7 +13,7 @@
     id, tid, service_life, service_year, year_sum, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_task_member
     where id = #{id,jdbcType=INTEGER}
@@ -23,10 +23,10 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TTaskMember">
-    insert into t_task_member (id, tid, service_life, 
+    insert into t_task_member (id, tid, service_life,
       service_year, year_sum, create_time
       )
-    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR},
       #{serviceYear,jdbcType=VARCHAR}, #{yearSum,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -103,4 +103,23 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
-</mapper>
+
+    <update id="updateByTid">
+      update t_task_member
+      <set>
+        <if test="serviceLife != null">
+          service_life = #{serviceLife,jdbcType=VARCHAR},
+        </if>
+        <if test="serviceYear != null">
+          service_year = #{serviceYear,jdbcType=VARCHAR},
+        </if>
+        <if test="yearSum != null">
+          year_sum = #{yearSum,jdbcType=INTEGER},
+        </if>
+        <if test="createTime != null">
+          create_time = #{createTime,jdbcType=TIMESTAMP},
+        </if>
+      </set>
+      where tid = #{tid,jdbcType=INTEGER}
+    </update>
+</mapper>

+ 27 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -44,8 +44,35 @@ public class TOrderTaskBo extends TOrderTask{
 	@Excel(name = "项目状态",sort = 13)
 	private String projectStatusName;
 
+	private String	serviceLife;
+	private String	serviceYear;
+	private Integer	yearSum;
 
 
+	public String getServiceLife() {
+		return serviceLife;
+	}
+
+	public void setServiceLife(String serviceLife) {
+		this.serviceLife = serviceLife;
+	}
+
+	public String getServiceYear() {
+		return serviceYear;
+	}
+
+	public void setServiceYear(String serviceYear) {
+		this.serviceYear = serviceYear;
+	}
+
+	public Integer getYearSum() {
+		return yearSum;
+	}
+
+	public void setYearSum(Integer yearSum) {
+		this.yearSum = yearSum;
+	}
+
 	public String getName() {
 		return name;
 	}

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

@@ -113,7 +113,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 修改项目(营销员)
 	 */
 	@RequestMapping(value = "/updateOrderTask",method = RequestMethod.POST)
-	public Result updateOrderTask(TOrderTask t){
+	public Result updateOrderTask(InputAddTask t){
 		Result res=new Result();
 		if(null==t.getId()){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","项目编号"));

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

@@ -524,7 +524,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateMemberProject" ,method = RequestMethod.POST)
-	public Result updateMemberProject(TOrderTask t){
+	public Result updateMemberProject(InputAddTask t){
 		Result res = new Result();
 		if(t.getId()==null){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"项目编号"));

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

@@ -33,7 +33,7 @@ public interface OrderNewService {
 	 * 修改项目信息
 	 * @param t
 	 */
-	int updateOrderTask(TOrderTask t);
+	int updateOrderTask(InputAddTask t);
 	/**
 	 * 删除项目
 	 * @param id

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

@@ -88,7 +88,7 @@ public interface OrderProjectService {
 
 	Result memberListExport(InputMemberList in);
 
-    int updateMemberProject(TOrderTask t);
+    int updateMemberProject(InputAddTask t);
 
 	int pushExamineMemberProject(InputMenber in);
 

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

@@ -252,7 +252,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public int updateOrderTask(TOrderTask t) {
+	public int updateOrderTask(InputAddTask t) {
 		TOrderTask use=tOrderTaskMapper.selectByPrimaryKey(t.getId());
 		boolean flag=false;
 		if(use.getCheckStatus()==1) {
@@ -295,6 +295,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			projcetCheckLogMapper.insertSelective(log);
 		}
 		int  i=tOrderTaskMapper.updateByPrimaryKeySelective(t);
+		if (t.getServiceLife()!=null&&t.getServiceYear()!=null){
+			TTaskMember ttm=new TTaskMember();
+			ttm.setTid(t.getId());
+			ttm.setServiceLife(t.getServiceLife());
+			ttm.setServiceYear(t.getServiceYear());
+			ttm.setYearSum(t.getYearSum());
+			tTaskMemberMapper.updateByTid(ttm);
+		}
 		if (flag) {
 			patentNewService.updateCostReduction(t.getId());
 		}

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

@@ -1126,7 +1126,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	@Override
-	public int updateMemberProject(TOrderTask t) {
+	public int updateMemberProject(InputAddTask t) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
 		if(task.getProcessStatus()!=4)throw  new BusinessException("审核状态错误,无法提交。");
 		addMemberLog(t.getId(),0,"修改重新发起");