kangwei：解决禅道bug

 package com.skua.modules.erp.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.core.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.context.BaseContextHandler;
-import com.skua.core.query.QueryGenerator;
-import com.skua.core.util.ConvertUtils;
 import com.skua.core.util.DateUtils;
-import com.skua.modules.equipment.service.IEquipmentSparepartService;
-import com.skua.modules.erp.entity.ApproveRecord;
 import com.skua.modules.erp.entity.PurchaseMaterial;
-import com.skua.modules.erp.service.IDistributMaterialService;
 import com.skua.modules.erp.service.IPurchaseMaterialService;
 import com.skua.modules.erp.vo.MaterialSearchVO;
 import com.skua.modules.erp.vo.PurchaseMaterialVO;
-import com.skua.modules.guest.util.DateUtil;
 import com.skua.modules.quartz.util.BaseUtil;
 import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
 import com.skua.modules.supplies.entity.EquipmentSparepartType;
 import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesService;
 import com.skua.modules.supplies.service.IEquipmentSparepartTypeService;
-import com.skua.modules.system.entity.SysUser;
-import com.skua.tool.dfs.MapDFS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

@@ -18,10 +18,7 @@ import com.skua.modules.erp.service.IErpSettlementService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.skua.modules.erp.vo.ErpSettlementFormVO;
-import com.skua.modules.erp.vo.ErpSettlementItemVO;
-import com.skua.modules.erp.vo.ErpSettlementVO;
-import com.skua.modules.erp.vo.SparepartSettlementVO;
+import com.skua.modules.erp.vo.*;
 import com.skua.modules.productionduty.utils.HolidaysUtils;
 import com.skua.tool.util.JSUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -52,13 +49,30 @@ public class ErpSettlementController {
 	@AutoLog(value = "药剂结算单详情-分页列表查询")
 	@ApiOperation(value="药剂结算单详情-分页列表查询(settlementType = 0 供应商结算集合，settlementType= 1 水厂结算)", notes="药剂结算单详情-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<ErpSettlement>> queryPageList(ErpSettlement erpSettlement,
+	public Result<IPage<ErpSettlement>> queryPageList(ErpSettlementSearchVO erpSettlementSearchVO,
 													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													  HttpServletRequest req) {
 		Result<IPage<ErpSettlement>> result = new Result<IPage<ErpSettlement>>();
-		QueryWrapper<ErpSettlement> queryWrapper = QueryGenerator.initQueryWrapper(erpSettlement, req.getParameterMap());
+		QueryWrapper<ErpSettlement> queryWrapper =  new QueryWrapper();// QueryGenerator.initQueryWrapper(erpSettlement, req.getParameterMap());
 		Page<ErpSettlement> page = new Page<ErpSettlement>(pageNo, pageSize);
+
+		if(StringUtils.isNotEmpty(erpSettlementSearchVO.getDepartId())){
+			queryWrapper.eq("depart_id" ,erpSettlementSearchVO.getDepartId()) ;
+		}
+		if(StringUtils.isNotEmpty(erpSettlementSearchVO.getSupplierId())){
+			queryWrapper.eq("supplier_id" ,erpSettlementSearchVO.getSupplierId()) ;
+		}
+		String startDate = req.getParameter("startDate");
+		if(StringUtils.isNotEmpty(startDate)){
+			startDate = startDate+" 00:00:00";
+			queryWrapper.ge("settlement_time",startDate);
+		}
+		String endDate = req.getParameter("endDate");
+		if(StringUtils.isNotEmpty(endDate)){
+			endDate = endDate+" 23:59:59";
+			queryWrapper.le("settlement_time",endDate );
+		}
 		IPage<ErpSettlement> pageList = erpSettlementService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -180,6 +194,8 @@ public class ErpSettlementController {
 				erpSettlementVO.setApproverSign(BaseContextHandler.getUserName());
 			}
 			erpSettlementService.saveSettlement(erpSettlementVO);
+            //修改药剂入库的状态
+            erpSettlementService.updateMaterialInSettlementFlag( erpSettlementVO,"1");
 			result.success("添加成功！");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -255,8 +271,9 @@ public class ErpSettlementController {
 			result.error500("未找到对应实体");
 		}else {
 			//修改 入库表状态
-			boolean ok = erpSettlementService.settlement(erpSettlementEntity);
+			boolean ok = erpSettlementService.updateById(erpSettlementEntity);
 			if(ok) {
+                erpSettlementService.updateMaterialInSettlementFlag( erpSettlementEntity,"2");
 				result.success("结算成功!");
 			}
 		}

@@ -208,10 +208,10 @@ public class MaterialIN {
 	@ApiModelProperty(value = "出库编号")
 	private String equipmentOutId;
 
-	@ApiModelProperty(value = "供应商结算，0:未结算,1:已结算")
+	@ApiModelProperty(value = "供应商结算，0:未结算,1::已申请，2：已结算")
 	private Integer supplierSettlementFlag;
 
-	@ApiModelProperty(value = "水厂结算，0:未结算,1:已结算")
+	@ApiModelProperty(value = "水厂结算，0:未结算,1:已申请，2：已结算")
 	private Integer waterDepartSettlementFlag;
 
 }

@@ -54,12 +54,12 @@
       select pc.id 'purchase_contract_id', pc.contract_code 'purchase_contract_code' , st.item_text as 'sparepart_type_name',
           (select sum(mi.material_num) from erp_material_in  mi where mi.audit_status = 3 and mi.good_code = aaa.good_code) 'storeNum',aaa.*
           from (
-                select  dc.contract_code 'distribut_contract_code', dc.id 'distribut_contract_id', dm.distribut_price ,dm.distribut_total_price,dm.material_num 'distribut_num',pm.*
+                select  dc.contract_code 'distribut_contract_code', dc.id 'distribut_contract_id', dm.distribut_price ,dm.distribut_total_price,dm.material_num ,pm.*
                 from erp_distribut_contract dc , erp_distribut_material dm , erp_purchase_material pm
                 where dc.id  = dm.contract_id  and dc.id = #{param.distributContractId } and dm.good_code = pm.good_code   and pm.del_flag = 0 and dc.use_flag = '0'
                 <if test="param.sparepartCode != null and param.sparepartCode !=''">and pm.sparepart_code =#{param.sparepartCode}</if>
                 <if test="param.sparepartType != null and param.sparepartType !=''">and pm.sparepart_type in (${param.sparepartType}) </if>
-                <if test="param.sparepartName != null and param.sparepartName !=''">and pm.sparepart_name like '%' #{param.sparepartName}'%'</if>
+                <if test="param.sparepartName != null and param.sparepartName !=''">and pm.sparepart_name like '%${param.sparepartName}%'</if>
         )aaa
         left join erp_purchase_contract pc on pc.id = aaa.contract_id
         left join  equipment_sparepart_type   st on  st.id =  aaa.sparepart_type

@@ -53,7 +53,7 @@
             <if test="ev.sparepartType != null  and ev.sparepartType != '' ">
                 and pi.sparepart_type  = #{ev.sparepartType}
             </if> <if test="ev.sparepartName != null  and ev.sparepartName != '' ">
-                AND pi.sparepart_name like '%'#{ev.sparepartName}'%'
+                AND pi.sparepart_name like '%${ev.sparepartName}%'
             </if>
             <if test="ev.applyYear != null  and ev.applyYear != '' ">
                 and pp.apply_year  = #{ev.applyYear}
@@ -67,6 +67,7 @@
             <if test="ev.endTime != null  and ev.endTime  != ''">
                 and pp.apply_time  &lt;= #{ev.endTime}
             </if>
+            order by pp.apply_time desc
     </select>
     <!--  and pp.depart_id in (#{ev.departs})-->
 </mapper>

@@ -43,8 +43,8 @@ public interface IErpSettlementService extends IService<ErpSettlement> {
     //水厂结算
     List<ErpSettlementVO> waterDepartSettlement(String materialInIds);
 
-    /***结算*/
-    boolean settlement(ErpSettlement erpSettlementEntity);
+    /***结算:修改 药剂入库结算状态*/
+    boolean updateMaterialInSettlementFlag(ErpSettlement erpSettlementEntity,String settlementFlag);
 
     // （供应商）送货单以及物资验收单
    // ErpSettlementFormVO querySupplierSettlementFormById(String id);

@@ -145,20 +145,20 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
     public List<ErpSettlementVO> waterDepartSettlement(String materialInIds){
         return  this.baseMapper.waterDepartSettlement( materialInIds );
     }
-    /***结算*/
-    @Transactional
-    public boolean settlement(ErpSettlement erpSettlementEntity){
+
+
+    //修改药剂入库的结算状态
+    public  boolean updateMaterialInSettlementFlag(ErpSettlement erpSettlementEntity,String settlementFlag){
         String sql = null;
         if("0".equals(  erpSettlementEntity.getSettlementType() )){//供应商结算
-            sql = "update erp_material_in mi set mi.supplier_settlement_flag = 1 where mi.id in ( select material_in_id from erp_settlement_item si where si.settlement_id = '"+erpSettlementEntity.getId()+"')";
+            sql = "update erp_material_in mi set mi.supplier_settlement_flag = "+settlementFlag+" where mi.id in ( select material_in_id from erp_settlement_item si where si.settlement_id = '"+erpSettlementEntity.getId()+"')";
         }
         if("1".equals(  erpSettlementEntity.getSettlementType() )){//水厂结算
-            sql = "update erp_material_in mi set mi.water_depart_settlement_flag = 1 where mi.id in ( select material_in_id from erp_settlement_item si where si.settlement_id = '"+erpSettlementEntity.getId()+"')";
+            sql = "update erp_material_in mi set mi.water_depart_settlement_flag = "+settlementFlag+" where mi.id in ( select material_in_id from erp_settlement_item si where si.settlement_id = '"+erpSettlementEntity.getId()+"')";
         }
         if(StringUtils.isNotEmpty(sql)){
             commonSqlService.update(sql);
         }
-        this.baseMapper.updateById( erpSettlementEntity );
         return true;
     }
 

+package com.skua.modules.erp.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther kangwei
+ * @create 2024-11-29-13:37
+ */
+@Data
+public class ErpSettlementSearchVO {
+    /**供应商id*/
+    @ApiModelProperty(value = "供应商id")
+    private String supplierId;
+    /**水厂编号*/
+    @ApiModelProperty(value = "水厂编号")
+    private String departId;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startDate;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endDate;
+}

@@ -12,11 +12,11 @@
 		left join sys_depart d on sw.depart_id  = d.id
 		where es.supplies_warehouse_id = sw.id and sw.depart_id in (${param.departIds})
         <if test="param.suppliesWarehouseId != null and param.suppliesWarehouseId !=''"> and sw.id =#{param.suppliesWarehouseId}</if>
-        <if test="param.sparepartCode != null and param.sparepartCode !=''">and es.sparepart_code like '%' #{param.sparepartCode}'%'</if>
+        <if test="param.sparepartCode != null and param.sparepartCode !=''">and es.sparepart_code like '%${param.sparepartCode}%'</if>
         <if test="param.sparepartType != null and param.sparepartType !=''">and es.sparepart_type in (${param.sparepartType}) </if>
-        <if test="param.sparepartName != null and param.sparepartName !=''">and es.sparepart_name like '%' #{param.sparepartName}'%'</if>
-        <if test="param.specification != null and param.specification !=''">and es.specification like '%' #{param.specification}'%'</if>
-
+        <if test="param.sparepartName != null and param.sparepartName !=''">and es.sparepart_name like '%${param.sparepartName}%'</if>
+        <if test="param.specification != null and param.specification !=''">and es.specification like '%${param.specification}%'</if>
+        <if test="param.sparepartAttribute != null and param.sparepartAttribute !=''">and es.sparepart_attribute like '%${param.sparepartAttribute}%'</if>
 		order by es.inventory_update_time desc
     </select>
 
@@ -24,9 +24,9 @@
     <select id="queryPageRelationList" resultType="com.skua.modules.equipment.vo.EquipmentSparepartVO" >
         select es.* from equipment_relation er , equipment_sparepart es
         where er.sparepart_id  = es.id and er.info_id = #{param.infoId}
-        <if test="param.sparepartCode != null and param.sparepartCode !=''">and es.sparepart_code like '%' #{param.sparepartCode}'%'</if>
-        <if test="param.sparepartName != null and param.sparepartName !=''">and es.sparepart_name like '%' #{param.sparepartName}'%'</if>
-        <if test="param.specification != null and param.specification !=''">and es.specification like '%' #{param.specification}'%'</if>
+        <if test="param.sparepartCode != null and param.sparepartCode !=''">and es.sparepart_code like '%${param.sparepartCode}%'</if>
+        <if test="param.sparepartName != null and param.sparepartName !=''">and es.sparepart_name like '%${param.sparepartName}%'</if>
+        <if test="param.specification != null and param.specification !=''">and es.specification like '%${param.specification}%'</if>
         order by es.inventory_update_time desc
     </select>
 </mapper>