From db1be72e80a9532ceda5000d79c153eb859caa05 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 16:46:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java | 12 +-
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStatisticsMapper.java | 2
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 20 ++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java | 20 +++++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java | 4
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml | 12 --
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java | 109 +++++++++++++++++---------
8 files changed, 121 insertions(+), 60 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
index cef6175..a36f9f6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
@@ -164,8 +164,8 @@
* @Date: 2025/4/9
*/
@RequiresPermissions("weldSeam:weldSeam:confirmWeldSeam")
- @GetMapping("/confirmWeldSeam")
- public AjaxResult confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp) {
+ @PostMapping("/confirmWeldSeam")
+ public AjaxResult confirmWeldSeam(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp) {
return toAjax(apsWeldSeamService.confirmWeldSeam(apsWeldSeamTemp));
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java
index 7df3c5f..84330c0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java
@@ -42,7 +42,7 @@
@GetMapping("/list")
public TableDataInfo list(ApsWeldSeamStatistics apsWeldSeamStatistics)
{
- startPage();
+// startPage();
List<ApsWeldSeamStatistics> list = apsWeldSeamStatisticsService.selectApsWeldSeamStatisticsList(apsWeldSeamStatistics);
return getDataTable(list);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java
index ff1fb46..ba4c8d0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java
@@ -38,7 +38,7 @@
/**
* 鏌ヨ鐒婄紳-涓存椂鍒楄〃
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:list")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:list")
@GetMapping("/list")
public TableDataInfo list(ApsWeldSeamTemp apsWeldSeamTemp)
{
@@ -50,7 +50,7 @@
/**
* 瀵煎嚭鐒婄紳-涓存椂鍒楄〃
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:export")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:export")
@Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsWeldSeamTemp apsWeldSeamTemp)
@@ -63,7 +63,7 @@
/**
* 鑾峰彇鐒婄紳-涓存椂璇︾粏淇℃伅
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:query")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -73,7 +73,7 @@
/**
* 鏂板鐒婄紳-涓存椂
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:add")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:add")
@Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp)
@@ -84,7 +84,7 @@
/**
* 淇敼鐒婄紳-涓存椂
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:edit")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:edit")
@Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp)
@@ -95,7 +95,7 @@
/**
* 鍒犻櫎鐒婄紳-涓存椂
*/
- @RequiresPermissions("gasPipingTemp:gasPipingTemp:remove")
+ @RequiresPermissions("weldSeamTemp:weldSeamTemp:remove")
@Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStatisticsMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStatisticsMapper.java
index d3b9d3b..1577bb1 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStatisticsMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStatisticsMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.aps.core.domain.ApsWeldSeamStatistics;
+import org.apache.ibatis.annotations.Mapper;
/**
* 鐒婄紳缁熻Mapper鎺ュ彛
@@ -9,6 +10,7 @@
* @author wwj
* @date 2025-04-09
*/
+@Mapper
public interface ApsWeldSeamStatisticsMapper
{
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
index 172c122..3445108 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
@@ -1,66 +1,66 @@
package com.aps.core.service.impl;
-import java.util.List;
-
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.IdUtils;
-import com.aps.core.domain.*;
+import com.aps.core.domain.ApsWeldSeam;
+import com.aps.core.domain.ApsWeldSeamStatistics;
+import com.aps.core.domain.ApsWeldSeamTemp;
+import com.aps.core.mapper.ApsWeldSeamMapper;
+import com.aps.core.mapper.ApsWeldSeamStatisticsMapper;
import com.aps.core.mapper.ApsWeldSeamTempMapper;
+import com.aps.core.service.IApsWeldSeamService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.aps.core.mapper.ApsWeldSeamMapper;
-import com.aps.core.service.IApsWeldSeamService;
-import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
* 鐒婄紳Service涓氬姟灞傚鐞�
- *
+ *
* @author wwj
* @date 2025-04-09
*/
@Service
-public class ApsWeldSeamServiceImpl implements IApsWeldSeamService
-{
+public class ApsWeldSeamServiceImpl implements IApsWeldSeamService {
@Autowired
private ApsWeldSeamMapper apsWeldSeamMapper;
@Autowired
private ApsWeldSeamTempMapper apsWeldSeamTempMapper;
+ @Autowired
+ private ApsWeldSeamStatisticsMapper apsWeldSeamStatisticsMapper;
/**
* 鏌ヨ鐒婄紳
- *
+ *
* @param id 鐒婄紳涓婚敭
* @return 鐒婄紳
*/
@Override
- public ApsWeldSeam selectApsWeldSeamById(String id)
- {
+ public ApsWeldSeam selectApsWeldSeamById(String id) {
return apsWeldSeamMapper.selectApsWeldSeamById(id);
}
/**
* 鏌ヨ鐒婄紳鍒楄〃
- *
+ *
* @param apsWeldSeam 鐒婄紳
* @return 鐒婄紳
*/
@Override
- public List<ApsWeldSeam> selectApsWeldSeamList(ApsWeldSeam apsWeldSeam)
- {
+ public List<ApsWeldSeam> selectApsWeldSeamList(ApsWeldSeam apsWeldSeam) {
return apsWeldSeamMapper.selectApsWeldSeamList(apsWeldSeam);
}
/**
* 鏂板鐒婄紳
- *
+ *
* @param apsWeldSeam 鐒婄紳
* @return 缁撴灉
*/
@Override
- public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam)
- {
+ public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam) {
apsWeldSeam.setId(IdUtils.fastUUID());
apsWeldSeam.setCreateTime(DateUtils.getNowDate());
return apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
@@ -68,58 +68,55 @@
/**
* 淇敼鐒婄紳
- *
+ *
* @param apsWeldSeam 鐒婄紳
* @return 缁撴灉
*/
@Override
- public int updateApsWeldSeam(ApsWeldSeam apsWeldSeam)
- {
+ public int updateApsWeldSeam(ApsWeldSeam apsWeldSeam) {
return apsWeldSeamMapper.updateApsWeldSeam(apsWeldSeam);
}
/**
* 鎵归噺鍒犻櫎鐒婄紳
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鐒婄紳涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteApsWeldSeamByIds(String[] ids)
- {
+ public int deleteApsWeldSeamByIds(String[] ids) {
return apsWeldSeamMapper.deleteApsWeldSeamByIds(ids);
}
/**
* 鍒犻櫎鐒婄紳淇℃伅
- *
+ *
* @param id 鐒婄紳涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteApsWeldSeamById(String id)
- {
+ public int deleteApsWeldSeamById(String id) {
return apsWeldSeamMapper.deleteApsWeldSeamById(id);
}
@Override
public int confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp) {
//鏌ヨ涓存椂琛ㄦ暟鎹�
- List<ApsWeldSeamTemp> apsWeldSeamTemps=apsWeldSeamTempMapper.selectApsWeldSeamTempList(apsWeldSeamTemp);
- int count=0;
- String[] ids=new String[apsWeldSeamTemps.size()];
- for (int i = 0; i <apsWeldSeamTemps.size() ; i++) {
+ List<ApsWeldSeamTemp> apsWeldSeamTemps = apsWeldSeamTempMapper.selectApsWeldSeamTempList(apsWeldSeamTemp);
+ int count = 0;
+ String[] ids = new String[apsWeldSeamTemps.size()];
+ for (int i = 0; i < apsWeldSeamTemps.size(); i++) {
//璁板綍涓存椂琛╥d
- ids[i]=apsWeldSeamTemps.get(i).getId();
- ApsWeldSeam apsWeldSeam=new ApsWeldSeam();
+ ids[i] = apsWeldSeamTemps.get(i).getId();
+ ApsWeldSeam apsWeldSeam = new ApsWeldSeam();
BeanUtils.copyProperties(apsWeldSeamTemps.get(i), apsWeldSeam);
//閫氳繃宸ュ崟鍙锋煡璇㈡槸鍚﹀瓨鍦ㄦ暟鎹�
- ApsWeldSeam apsWeldSeam1=apsWeldSeamMapper.selectApsWeldSeamByWorkOrderNo(apsWeldSeam.getWorkOrderNo());
+ ApsWeldSeam apsWeldSeam1 = apsWeldSeamMapper.selectApsWeldSeamByWorkOrderNo(apsWeldSeam.getWorkOrderNo());
//褰撳伐鍗曞彿瀛樺湪鍒欐洿鏂版暟鎹惁鍒欐彃鍏ユ暟鎹�
- if(StringUtils.isNotEmpty(apsWeldSeam1.getId())){
+ if (StringUtils.isNotEmpty(apsWeldSeam1.getId())) {
apsWeldSeam.setId(apsWeldSeam1.getId());
apsWeldSeamMapper.updateApsWeldSeam(apsWeldSeam);
- }else {
+ } else {
//鎻掑叆姝ｅ紡琛紝骞惰褰�
apsWeldSeam.setId(IdUtils.fastUUID());
apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
@@ -127,11 +124,47 @@
count++;
}
//鎻掑叆鏁伴噺涓庝复鏃惰〃鏌ヨ涓�鐩村垯鍒犻櫎涓存椂琛ㄦ暟鎹�
- if (count==apsWeldSeamTemps.size()) {
+ if (count == apsWeldSeamTemps.size()) {
apsWeldSeamTempMapper.deleteApsWeldSeamTempByIds(ids);
}
//鎻掑叆鐒婄紳缁熻琛�
- List<ApsWeldSeamStatistics> apsWeldSeamStatistics=apsWeldSeamMapper.weldSeamStat(apsWeldSeamTemps);
+ List<ApsWeldSeamStatistics> apsWeldSeamStatistics = apsWeldSeamMapper.weldSeamStat(apsWeldSeamTemps);
+ for (int i = 0; i < apsWeldSeamStatistics.size(); i++) {
+ List<ApsWeldSeamStatistics> apsWeldSeamStatistics1 = apsWeldSeamStatisticsMapper.selectApsWeldSeamStatisticsList(apsWeldSeamStatistics.get(i));
+ if (apsWeldSeamStatistics1.size() > 0) {
+ ApsWeldSeamStatistics apsWeldSeamStatistics2 = apsWeldSeamStatistics1.get(0);
+ apsWeldSeamStatistics2.setPipingOrderRequirement(apsWeldSeamStatistics.get(i).getPipingOrderRequirement());
+ apsWeldSeamStatistics2.setGasOrderRequirement(apsWeldSeamStatistics.get(i).getGasOrderRequirement());
+ apsWeldSeamStatistics2.setPipingPredictionRequirement(apsWeldSeamStatistics.get(i).getPipingPredictionRequirement());
+ apsWeldSeamStatistics2.setGasPredictionRequirement(apsWeldSeamStatistics.get(i).getGasPredictionRequirement());
+ //棰勭暀绱ф�ヨ鍗曚骇鍑烘槸鍚︿负绌�
+ if (apsWeldSeamStatistics2.getReserveEmergencyOrderOutput() != null) {
+ apsWeldSeamStatistics2.setTotal(apsWeldSeamStatistics2.getPipingOrderRequirement() + apsWeldSeamStatistics2.getPipingPredictionRequirement() + apsWeldSeamStatistics2.getGasOrderRequirement() + apsWeldSeamStatistics2.getGasPredictionRequirement() + apsWeldSeamStatistics2.getReserveEmergencyOrderOutput());
+ //澶╂暟涓嶄负绌鸿绠楅渶姹傛棩鐒婄紳
+ if(apsWeldSeamStatistics2.getDays()!=null){
+ // 杞崲涓� double 绫诲瀷杩涜闄ゆ硶杩愮畻
+ double result = (double) apsWeldSeamStatistics2.getTotal() / apsWeldSeamStatistics2.getDays();
+ // 鍥涜垗浜斿叆
+ long roundedResult = Math.round(result);
+ apsWeldSeamStatistics2.setRequirementDayWeldSeam(roundedResult);
+ //鍒ゆ柇鐢熶骇鏃ョ剨缂濅笉涓虹┖璁＄畻鏄惁婊¤冻
+ if(apsWeldSeamStatistics2.getProductionDayWeldSeam()!=null){
+ if(apsWeldSeamStatistics2.getProductionDayWeldSeam()>=apsWeldSeamStatistics2.getRequirementDayWeldSeam()){
+ apsWeldSeamStatistics2.setIsSatisfy("鏄�");
+ }else{
+ apsWeldSeamStatistics2.setIsSatisfy("鍚�");
+ }
+ }
+ }
+ }
+ apsWeldSeamStatisticsMapper.updateApsWeldSeamStatistics(apsWeldSeamStatistics2);
+ }else {
+ apsWeldSeamStatistics.get(i).setId(IdUtils.fastUUID());
+ apsWeldSeamStatistics.get(i).setCreateTime(DateUtils.getNowDate());
+ apsWeldSeamStatisticsMapper.insertApsWeldSeamStatistics(apsWeldSeamStatistics.get(i));
+ }
+
+ }
return 1;
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
index c621166..0eb3ad3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
@@ -69,6 +69,26 @@
public int updateApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics)
{
apsWeldSeamStatistics.setUpdateTime(DateUtils.getNowDate());
+ //棰勭暀绱ф�ヨ鍗曚骇鍑烘槸鍚︿负绌�
+ if (apsWeldSeamStatistics.getReserveEmergencyOrderOutput() != null) {
+ apsWeldSeamStatistics.setTotal(apsWeldSeamStatistics.getPipingOrderRequirement() + apsWeldSeamStatistics.getPipingPredictionRequirement() + apsWeldSeamStatistics.getGasOrderRequirement() + apsWeldSeamStatistics.getGasPredictionRequirement() + apsWeldSeamStatistics.getReserveEmergencyOrderOutput());
+ //澶╂暟涓嶄负绌鸿绠楅渶姹傛棩鐒婄紳
+ if(apsWeldSeamStatistics.getDays()!=null){
+ // 杞崲涓� double 绫诲瀷杩涜闄ゆ硶杩愮畻
+ double result = (double) apsWeldSeamStatistics.getTotal() / apsWeldSeamStatistics.getDays();
+ // 鍥涜垗浜斿叆
+ long roundedResult = Math.round(result);
+ apsWeldSeamStatistics.setRequirementDayWeldSeam(roundedResult);
+ //鍒ゆ柇鐢熶骇鏃ョ剨缂濅笉涓虹┖璁＄畻鏄惁婊¤冻
+ if(apsWeldSeamStatistics.getProductionDayWeldSeam()!=null){
+ if(apsWeldSeamStatistics.getProductionDayWeldSeam()>=apsWeldSeamStatistics.getRequirementDayWeldSeam()){
+ apsWeldSeamStatistics.setIsSatisfy("鏄�");
+ }else{
+ apsWeldSeamStatistics.setIsSatisfy("鍚�");
+ }
+ }
+ }
+ }
return apsWeldSeamStatisticsMapper.updateApsWeldSeamStatistics(apsWeldSeamStatistics);
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
index f0564b2..5cf207c 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -153,7 +153,23 @@
#{id}
</foreach>
</delete>
- <select id="weldSeamStat" >
-
+ <select id="weldSeamStat" parameterType="java.util.List" resultType="com.aps.core.domain.ApsWeldSeamStatistics">
+ SELECT produce_year as year,
+ produce_month as month,
+ production_base as productionBase,
+ SUM ( CASE WHEN work_order_type = '0' AND classification = '1' THEN production_quantity ELSE 0 END ) AS pipingOrderRequirement,
+ SUM ( CASE WHEN work_order_type = '0' AND classification = '0' THEN production_quantity ELSE 0 END ) AS gasOrderRequirement,
+ SUM ( CASE WHEN work_order_type = '1' AND classification = '1' THEN production_quantity ELSE 0 END ) AS pipingPredictionRequirement,
+ SUM ( CASE WHEN work_order_type = '1' AND classification = '0' THEN production_quantity ELSE 0 END ) AS gasPredictionRequirement
+ FROM
+ "aps_weld_seam"
+ where 1=1
+ <foreach item="item" index="index" collection="list" separator=",">
+ or ( produce_year=#{item.produceYear} and produce_month=#{item.produceMonth} and production_base=#{item.productionBase})
+ </foreach>
+ GROUP BY
+ produce_year,
+ produce_month,
+ production_base
</select>
</mapper>
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
index 0fa48b1..a8d82c3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
@@ -35,17 +35,7 @@
<where>
<if test="params.beginYear != null and params.beginYear != '' and params.endYear != null and params.endYear != ''"> and year between #{params.beginYear} and #{params.endYear}</if>
<if test="params.beginMonth != null and params.beginMonth != '' and params.endMonth != null and params.endMonth != ''"> and month between #{params.beginMonth} and #{params.endMonth}</if>
- <if test="productionBase != null and productionBase != ''"> and production_base like concat('%', #{productionBase}, '%')</if>
- <if test="pipingOrderRequirement != null "> and piping_order_requirement = #{pipingOrderRequirement}</if>
- <if test="gasOrderRequirement != null "> and gas_order_requirement = #{gasOrderRequirement}</if>
- <if test="pipingPredictionRequirement != null "> and piping_prediction_requirement = #{pipingPredictionRequirement}</if>
- <if test="gasPredictionRequirement != null "> and gas_prediction_requirement = #{gasPredictionRequirement}</if>
- <if test="reserveEmergencyOrderOutput != null "> and reserve_emergency_order_output = #{reserveEmergencyOrderOutput}</if>
- <if test="total != null "> and total = #{total}</if>
- <if test="days != null "> and days = #{days}</if>
- <if test="requirementDayWeldSeam != null "> and requirement_day_weld_seam = #{requirementDayWeldSeam}</if>
- <if test="productionDayWeldSeam != null "> and production_day_weld_seam = #{productionDayWeldSeam}</if>
- <if test="isSatisfy != null and isSatisfy != ''"> and is_satisfy = #{isSatisfy}</if>
+ <if test="productionBase != null and productionBase != ''"> and production_base like '%'|| #{productionBase}|| '%'</if>
</where>
</select>
--
Gitblit v1.9.3