Browse Source

变更流程列表开发

anderx 3 years ago
parent
commit
e7ad3cf7f8

+ 3 - 0
src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java

@@ -8,6 +8,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import com.goafanti.order.bo.OutProcessName;
 import org.apache.ibatis.annotations.Param;
 
 public interface NewOrderChangeMapper {
@@ -52,4 +53,6 @@ public interface NewOrderChangeMapper {
                           @Param("names")String names);
 
     int updateTaskExamineName(@Param("aid") String aid, @Param("taskReceiverId") String taskReceiverId,@Param("type") Integer type);
+
+    OutProcessName gerProcessName(@Param("id") Integer id, @Param("orderNo") String orderNo);
 }

+ 40 - 0
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -733,6 +733,7 @@ select
 	select id,used_order usedOrder from new_order_change where  order_no= #{orderNo} order by id
 	</select>
 
+
   <update id="updateExamineName">
     update  new_order_change a
     <if test="names ==null">
@@ -771,4 +772,43 @@ select
       set n.examine_name =a.name
       where n.process_state =#{type}
     </update>
+
+  <select id="gerProcessName" resultType="com.goafanti.order.bo.OutProcessName">
+    select a.id,a.order_no orderNo ,a.`type`,a.change_amount changeAmount ,c.name yxy,mg.name yxjl,
+           yxgly.name yxgly,zxs.name zxs,zxsjl.name zxsjl, zxsgly.name zxsgly,fm.name cwzy,cwgly.name cwgly,
+           zc.name zc,dsz.name dsz
+    from new_order_change a
+           left join t_order_new b on a.order_no =b.order_no
+           left join admin c on b.salesman_id =c.id
+           left join department dep on b.order_dep =dep.id
+           left join admin fm on dep.finance_id =fm.id
+           left join admin mg on c.manager_id =mg.id
+           left join (select a.department_id depId,group_concat(a.name) name
+                      from admin a left join user_role b on a.id=b.uid
+                                   left join `role` c on b.rid =c.id
+                      where c.role_type ='9996' and a.status ='0' group by a.department_id )yxgly on b.order_dep =yxgly.depId
+           left join (select a.order_no ,a.`type` ,GROUP_CONCAT(distinct b.name) name
+                      from order_examine a left join admin b on a.aid=b.id where a.order_no = #{orderNo} and a.`type` =0
+                      group by order_no ,type)zxs on a.order_no =zxs.order_no
+           left join (select a.order_no ,a.`type` ,GROUP_CONCAT(distinct b.name) name
+                      from order_examine a left join admin b on a.aid=b.id where a.order_no = #{orderNo} and a.`type` =1
+                      group by order_no ,type)zxsjl on a.order_no =zxsjl.order_no
+           left join (select group_concat(a.name) name
+                      from admin a left join user_role b on a.id=b.uid
+                                   left join `role` c on b.rid =c.id
+                      where c.role_type in ('99998','99988') and a.status ='0' ) zc on 1=1
+           left join (select group_concat(a.name) name
+                      from admin a left join user_role b on a.id=b.uid
+                                   left join `role` c on b.rid =c.id
+                      where c.role_type in ('99999','99989') and a.status ='0' ) dsz on 1=1
+           left join (select group_concat(a.name) name
+                      from admin a left join user_role b on a.id=b.uid
+                                   left join `role` c on b.rid =c.id
+                      where c.role_type in ('9998') and a.status ='0' ) zxsgly on 1=1
+           left join (select group_concat(a.name) name
+                      from admin a left join user_role b on a.id=b.uid
+                                   left join `role` c on b.rid =c.id
+                      where c.role_type in ('9997') and a.status ='0' ) cwgly on 1=1
+    where a.id= #{id}
+  </select>
 </mapper>

+ 1 - 0
src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java

@@ -28,6 +28,7 @@ public class FastJsonRedisSerializer implements RedisSerializer<Object> {
 		pc.addAccept("com.goafanti.weChat.bo.OutPublicStatistics");
 		pc.addAccept("com.goafanti.core.mybatis.page.Pagination");
 		pc.addAccept("com.goafanti.common.bo.Result");
+		pc.addAccept("com.goafanti.order.bo.OrderProcessName");
 		pc.addAccept("com.goafanti.permission.bo.PermissionBo");
 		pc.addAccept("java.util.Map");
 

+ 130 - 0
src/main/java/com/goafanti/order/bo/OutProcessName.java

@@ -0,0 +1,130 @@
+package com.goafanti.order.bo;
+
+public class OutProcessName {
+    private String id;
+    private String orderNo;
+    private String type;
+    private String changeAmount;
+    private String yxy;
+    private String yxjl;
+    private String yxgly;
+    private String zxs;
+    private String zxsjl;
+    private String zxsgly;
+    private String cwzy;
+    private String cwgly;
+    private String zc;
+    private String dsz;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getChangeAmount() {
+        return changeAmount;
+    }
+
+    public void setChangeAmount(String changeAmount) {
+        this.changeAmount = changeAmount;
+    }
+
+    public String getYxy() {
+        return yxy;
+    }
+
+    public void setYxy(String yxy) {
+        this.yxy = yxy;
+    }
+
+    public String getYxjl() {
+        return yxjl;
+    }
+
+    public void setYxjl(String yxjl) {
+        this.yxjl = yxjl;
+    }
+
+    public String getYxgly() {
+        return yxgly;
+    }
+
+    public void setYxgly(String yxgly) {
+        this.yxgly = yxgly;
+    }
+
+    public String getZxs() {
+        return zxs;
+    }
+
+    public void setZxs(String zxs) {
+        this.zxs = zxs;
+    }
+
+    public String getZxsjl() {
+        return zxsjl;
+    }
+
+    public void setZxsjl(String zxsjl) {
+        this.zxsjl = zxsjl;
+    }
+
+    public String getZxsgly() {
+        return zxsgly;
+    }
+
+    public void setZxsgly(String zxsgly) {
+        this.zxsgly = zxsgly;
+    }
+
+    public String getCwzy() {
+        return cwzy;
+    }
+
+    public void setCwzy(String cwzy) {
+        this.cwzy = cwzy;
+    }
+
+    public String getCwgly() {
+        return cwgly;
+    }
+
+    public void setCwgly(String cwgly) {
+        this.cwgly = cwgly;
+    }
+
+    public String getZc() {
+        return zc;
+    }
+
+    public void setZc(String zc) {
+        this.zc = zc;
+    }
+
+    public String getDsz() {
+        return dsz;
+    }
+
+    public void setDsz(String dsz) {
+        this.dsz = dsz;
+    }
+}

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

@@ -247,7 +247,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/getProcessName", method = RequestMethod.GET)
-	@Cacheable(value = "getProcessName", key = "'BannersList:Key:'+#orderNo")
+	@Cacheable(value = "getProcessName", key = "'Key:'+#orderNo")
 	public Result getProcessName(String orderNo){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){

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

@@ -570,4 +570,15 @@ public class OrderChangeApiController extends CertifyApiController {
 		}
 		return res.data(orderChangeService.updateMemberSonProject( id,taskComment));
 	}
+
+
+	@RequestMapping(value = "/gerProcessName" ,method = RequestMethod.GET)
+	public Result gerProcessName(Integer id){
+		Result res = new Result();
+		if(id==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更编号"));
+			return res;
+		}
+		return res.data(orderChangeService.gerProcessName( id));
+	}
 }

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

@@ -113,4 +113,6 @@ public interface OrderChangeService {
 	int deleteMemberSonProject(Integer id);
 
     Object updateMemberSonProject(Integer id,String taskComment);
+
+	Object gerProcessName(Integer id);
 }

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

@@ -1438,6 +1438,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return tChangeTask;
 	}
 
+
+
 	/**
 	 * 	如果是有splitSuper 是父有项目的tid,变更父项目有订单项目,则需要看订单项目变更后的子集,反正则不需要
 	 * 	changeSplitSuper 是当前变更项目的子集
@@ -1452,4 +1454,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 
+
+	@Override
+	public Object gerProcessName(Integer id) {
+		NewOrderChange newOrderChange=newOrderChangeMapper.selectByPrimaryKey(id);
+		newOrderChangeMapper.gerProcessName(id,newOrderChange.getOrderNo());
+		return null;
+	}
 }