Commit b16bcb175b4e67f2469d7d4d65a4d82af94ca27c

Authored by 房远帅
1 parent 8761c83c

楚江ERP:分厂审核

... ... @@ -81,22 +81,13 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
81 81 // 厂房类型处理
82 82 String workshopType = vo.getWorkshopType();
83 83 if ("TYPE_1".equals(workshopType)) {
84   - // 一、二分厂
85   - List<String> workshopNameList = new ArrayList<>();
86   - workshopNameList.add("一分厂");
87   - workshopNameList.add("二分厂");
88   - vo.setWorkshopNames(workshopNameList);
  84 + vo.setWorkshopCode("yfc");
89 85 } else if ("TYPE_2".equals(workshopType)) {
90   - // 三、四分厂
91   - List<String> workshopNameList = new ArrayList<>();
92   - workshopNameList.add("三分厂");
93   - workshopNameList.add("四分厂");
94   - vo.setWorkshopNames(workshopNameList);
  86 + vo.setWorkshopCode("efc");
95 87 } else if ("TYPE_3".equals(workshopType)) {
96   - // 紫铜分厂
97   - List<String> workshopNameList = new ArrayList<>();
98   - workshopNameList.add("紫铜分厂");
99   - vo.setWorkshopNames(workshopNameList);
  88 + vo.setWorkshopCode("sfc");
  89 + } else if ("TYPE_4".equals(workshopType)) {
  90 + vo.setWorkshopCode("ztfc");
100 91 }
101 92 // 待办类型
102 93 String todoType = vo.getTodoType();
... ...
... ... @@ -82,11 +82,8 @@
82 82 <if test="vo.status != null and vo.status != ''">
83 83 AND tb.status = #{vo.status}
84 84 </if>
85   - <if test = "vo.workshopType != null and vo.workshopType != ''">
86   - AND w.name in
87   - <foreach collection="vo.workshopNames" open="(" separator="," close=")" item="item">
88   - #{item}
89   - </foreach>
  85 + <if test="vo.workshopCode != null and vo.workshopCode != ''">
  86 + AND w.code = #{vo.workshopCode}
90 87 </if>
91 88 <if test="vo.createStartTime != null">
92 89 AND tb.create_time >= #{vo.createStartTime}
... ...