禅道bug 已经筛查一遍

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java

@@ -853,8 +853,9 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	//todo  导出样品标签功能待完善
 	@PostMapping("/exportSampleLabel/{entrustId}")
-	@ApiOperation("导出样品流转单")
+	@ApiOperation("导出样品标签")
 	public void exportSampleLabel(@PathVariable("entrustId") Integer entrustId,
 	                             HttpServletResponse response) {
 		Map<String, Object> map = entrustService.getSampleLabelList(entrustId).getData();
@@ -869,11 +870,16 @@ public class EntrustController {
 
 		Map<String, Object> beanParams = new HashMap<>(5);
 
-
 		//(不包含平行样)
+		List<SampleLabelVo> sampleLabelVoList = new ArrayList<>();
+		for(int i=0; i<sampleList.size(); i++){
+			SampleLabelVo sampleLabelVo = new SampleLabelVo();
+			i=i+4;
+		}
+
 		beanParams.put("list", sampleList);
 
-		WordUtil.writeWordReport(entrust.getEntrustCode() +"-"+ entrust.getProjectName() + "-样品流转单",
+		WordUtil.writeWordReport(entrust.getEntrustCode() +"-"+ entrust.getProjectName() + "-样品标签",
 				"sampleFlow.ftl",
 				beanParams, response, FileExt.DOC);
 	}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/ConsumablesMapper.java

 package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.Consumables;
+import cn.wise.sc.cement.business.model.vo.EquipmentVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,5 +20,9 @@ import java.util.Map;
  */
 public interface ConsumablesMapper extends BaseMapper<Consumables> {
 
+	IPage<Consumables> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
+
+
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/StandardMapper.java

@@ -2,8 +2,11 @@ package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.Standard;
 import cn.wise.sc.cement.business.entity.StandardGroupDto;
+import cn.wise.sc.cement.business.model.vo.EquipmentVo;
 import cn.wise.sc.cement.business.model.vo.StandardValueVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,6 +22,9 @@ import java.util.Map;
  */
 public interface StandardMapper extends BaseMapper<Standard> {
 
+
+	IPage<Standard> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
 	List<StandardValueVo> getStandardDetaulList();
 
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/ConsumablesMapper.xml

@@ -8,21 +8,32 @@
                 and t.name like concat('%', #{params.name}, '%')
             </if>
             <if test="params.supplierName != null and params.supplierName != ''">
-                and t.supplier_name = #{params.supplierName}
+                and s.name = #{params.supplierName}
             </if>
         </where>
     </sql>
 
+    <select id="getPage" resultType="cn.wise.sc.cement.business.entity.Consumables">
+        SELECT t.*, s.name as supplierName
+        FROM consumables t
+        left join supplier s on s.id = t.supplier_id
+        <include refid="where"/>
+        ORDER BY t.id DESC
+    </select>
+
+
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
         t.name as 易耗品名称,
         t.code as '易耗品代号',
-        t.supplier_name as 供应商,
+        s.name as 供应商,
         t.position as 位置,
         t.purchase_date as 购买日期,
         t.stock_num as 库存数量
-        FROM consumables t ,(select @i:=0)t
+        FROM consumables t
+        left join supplier s on s.id = t.supplier_id
+        ,(select @i:=0)t
         <include refid="where"/>
         ORDER BY t.id DESC
     </select>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApprovalMapper.xml

@@ -4,6 +4,7 @@
 
     <sql id="where">
         <where>
+            na.`status` != 0
             <if test="params.name != null and params.name != ''">
                 and su.name like concat('%', #{params.name}, '%')
             </if>
@@ -24,7 +25,6 @@
         from nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
         <include refid="where"/>
-        <where> na.`status` != 0</where>
         order by na.start_time desc
     </select>
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/StandardMapper.xml

@@ -14,7 +14,7 @@
     <sql id="where">
         <where>
             <if test="params.supplierName != null and params.supplierName != ''">
-                and t.supplier_name = #{params.supplierName}
+                and s.name = #{params.supplierName}
             </if>
             <if test="params.name != null and params.name != ''">
                 and t.name like concat('%', #{params.name}, '%')
@@ -22,12 +22,22 @@
         </where>
     </sql>
 
+    <select id="getPage" resultType="cn.wise.sc.cement.business.entity.Standard">
+        SELECT t.*, s.name as supplierName
+        FROM standard t
+        left join supplier s on s.id = t.supplier_id
+        <include refid="where"/>
+        ORDER BY t.id DESC
+    </select>
+
+
+
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
         t.name as 标样名称,
         t.code as 标物代号,
-        t.supplier_name as 经销单位,
+        s.name as 经销单位,
         t.position as 存放位置,
         t.purchase_date as 进样日期,
         t.valid_date as 有效日期,
@@ -39,7 +49,9 @@
         ELSE NULL
         END
         ) as 状态
-        FROM standard t ,(select @i:=0)t
+        FROM standard t
+        left join supplier s on s.id = t.supplier_id
+        ,(select @i:=0)t
         <include refid="where"/>
         ORDER BY t.id DESC
     </select>

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/EquipmentScrapApprovalQuery.java

@@ -17,7 +17,7 @@ public class EquipmentScrapApprovalQuery {
 	@ApiModelProperty("设备报废表id")
 	private Integer id;
 
-	@ApiModelProperty("是否同意 1同意，2拒绝")
+	@ApiModelProperty("是否同意 1同意，0拒绝")
 	private Integer isAgree;
 
 	@ApiModelProperty("审批意见")

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleLabelVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-24 14:58
+ **/
+@Data
+@ApiModel("委托-样品标签打印Vo")
+public class SampleLabelVo {
+
+
+	@ApiModelProperty("样品名")
+	private String sampleName1;
+
+	@ApiModelProperty("平行样编号")
+	private String parallelCode1;
+
+	@ApiModelProperty("样品名")
+	private String sampleName2;
+
+	@ApiModelProperty("平行样编号")
+	private String parallelCode2;
+
+	@ApiModelProperty("样品名")
+	private String sampleName3;
+
+	@ApiModelProperty("平行样编号")
+	private String parallelCode3;
+
+	@ApiModelProperty("样品名")
+	private String sampleName4;
+
+	@ApiModelProperty("平行样编号")
+	private String parallelCode4;
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/StandardVo.java

@@ -39,6 +39,9 @@ public class StandardVo {
 	@ApiModelProperty("购买厂商（经销单位）")
 	private String supplierName;
 
+	@ApiModelProperty("生产日期")
+	private LocalDate productionDate;
+
 	@ApiModelProperty("进样日期")
 	private LocalDate purchaseDate;
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ConsumablesServiceImpl.java

@@ -9,6 +9,7 @@ import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.ChangeValidDateQuery;
 import cn.wise.sc.cement.business.model.query.ChangeStockQuery;
+import cn.wise.sc.cement.business.model.vo.EquipmentVo;
 import cn.wise.sc.cement.business.service.IConsumablesService;
 import cn.wise.sc.cement.business.service.ISysUserService;
 import cn.wise.sc.cement.business.util.ExcelUtil;
@@ -62,7 +63,7 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 	 */
 	@Override
 	public BaseResponse<IPage<Consumables>> getPage(PageQuery pageQuery, String name, String supplierName) {
-		QueryWrapper<Consumables> qw = new QueryWrapper<>();
+		/*QueryWrapper<Consumables> qw = new QueryWrapper<>();
 		if (StringUtils.isNotEmpty(name)) {
 			qw.like("name", name);
 		}
@@ -72,7 +73,13 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 		qw.orderByDesc("create_time");
 		IPage<Consumables> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		page = consumablesMapper.selectPage(page, qw);
-		return BaseResponse.okData(page);
+*/
+		Map<String, Object> params = new HashMap<>();
+		params.put("name", name);
+		params.put("supplierName", supplierName);
+		Page<Consumables> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		IPage<Consumables> pages = consumablesMapper.getPage(page, params);
+		return BaseResponse.okData(pages);
 	}
 
 	/**

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -1282,6 +1282,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                     .setProjectCode(projectVo.getCode())
                     .setProjectName(projectVo.getName());
         }
+        //审批后生成委托编号
+        String entrustCode = entrust.getProjectCode()+"-"+query.getSampleList().get(0).getCementCode();
+        entrust.setEntrustCode(entrustCode);
         if (query.getIsAgree() == 1) { //通过
             if (StringUtils.isEmpty(query.getProjectType())) {
                 return BaseResponse.errorMsg("请选择项目类型");
@@ -1294,9 +1297,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                 return results;
             }
             entrust.setStatus(1).setProjectType(query.getProjectType());
-            //审批后生成委托编号
-            String entrustCode = entrust.getProjectCode()+"-"+query.getSampleList().get(0).getCementCode();
-            entrust.setEntrustCode(entrustCode);
             logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "修改评审状态为“通过”", null);
             //*****************************以上为评审接口******************
             //*****************************样品处理派发合并到评审接口中******************
@@ -2607,6 +2607,14 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                 }
                 distribution.setStatus(2).setFinishTime(LocalDateTime.now());
                 distributionMapper.updateById(distribution);
+
+                //删除之前的设备记录
+                QueryWrapper<SampleDistributionEquipment> sdbeWrapper = new QueryWrapper<>();
+                sdbeWrapper.eq("distribution_id", distribution.getId());
+                List<SampleDistributionEquipment> sdbeList = sampleDistributionEquipmentService.list(sdbeWrapper);
+                if(sdbeList!= null && sdbeList.size()>0){
+                    sampleDistributionEquipmentService.remove(sdbeWrapper);
+                }
                 //保存选择设备信息
                 if(finishCheckQuery.getEquipmentIdList() != null && finishCheckQuery.getEquipmentIdList().size()>0){
                     List<SampleDistributionEquipment> sdeList = new ArrayList<>();
@@ -2659,10 +2667,17 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         sampleMapper.updateById(sample);
 
         if (entrust != null) {
-            List<Sample> sampleList = sampleMapper.getNoDistributionList(sample.getEntrustId());
+            QueryWrapper<SampleDistribution> sdWrapper = new QueryWrapper<>();
+            sdWrapper.eq("entrust_id", entrust.getId());
+            sdWrapper.lt("status", 2);
+            List<SampleDistribution> sdIngList = distributionMapper.selectList(sdWrapper);
+            if (sdIngList == null || sdIngList.size() == 0) {
+                entrust.setStatus(6);;//委托单改成检测完成状态
+            }
+           /* List<Sample> sampleList = sampleMapper.getNoDistributionList(sample.getEntrustId());
             if (sampleList == null || sampleList.size() == 0) {
                 entrust.setStatus(6);
-            }
+            }*/
             entrustMapper.updateById(entrust);
             //计算产值
             List<SampleTeamGroupUserVo> sampleDistributionTeamGroupVoList = distributionMapper.getDistributionTeamGroupList(sample.getId(), loginUser.getId());
@@ -3352,6 +3367,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         if (query.getIsAgree() == null || ( query.getIsAgree() != 1 && query.getIsAgree() != 2)) {
             return BaseResponse.errorMsg("请选择正确按钮");
         }
+        if(query.getIsAgree() ==2  && StringUtils.isEmpty(query.getAuditReason())){
+            return BaseResponse.errorMsg("请填写退回原因");
+        }
         Entrust entrust = entrustMapper.selectById(query.getEntrustId());
         if (entrust == null) {
             return BaseResponse.errorMsg("信息错误");
@@ -3428,7 +3446,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             disWrapper.eq("entrust_id", entrust.getId());
             disWrapper.ne("status", 4);
             List<SampleDistribution> disList = distributionMapper.selectList(disWrapper);
-            if(disList == null && disList.size()>0){
+            if(disList != null && disList.size()>0){
                 ret = false; //有一个检测组没有校核，证明校核没有完成
             }
 
@@ -3444,12 +3462,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                         sampleMapper.updateById(sample);
                     }
                 }
-            }
 
-
-            //如果是保存并完成按钮，检测委托单中其他样品是否都是保存冰完成状态，如果是，委托单为检测完成状态
-            List<Sample> sampleNoCheckList = sampleMapper.getNoCheckList(entrust.getId());
-            if (sampleNoCheckList == null || sampleNoCheckList.size() == 0) {
                 entrust.setStatus(8);
                 //校核完成之后 ，提醒评审人员查看
                 List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
@@ -3479,6 +3492,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                         systemUrl +"进行查看。";
                 weiXinService.sendTextMessage(userIds, content);
 
+
+
+
+
             }
 
         }else if (query.getIsAgree() == 2){ //退回

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java

@@ -539,11 +539,10 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 		if (equipmentScrap == null) {
 			return BaseResponse.errorMsg("信息错误!");
 		}
-		equipmentScrap.setStatus(query.getIsAgree());
 		equipmentScrap.setOpinion(query.getAuditReason());
-
-		scrapMapper.updateById(equipmentScrap);
 		if (query.getIsAgree() == 1) {
+			equipmentScrap.setStatus(1);
+			scrapMapper.updateById(equipmentScrap);
 			Equipment equipment = equipmentMapper.selectById(equipmentScrap.getEquipmentId());
 			if (equipment == null) {
 				return BaseResponse.errorMsg("信息错误!");
@@ -551,6 +550,8 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 			equipment.setStatus(3);//报废状态
 			equipmentMapper.updateById(equipment);
 		}else{
+			equipmentScrap.setStatus(2);
+			scrapMapper.updateById(equipmentScrap);
 			Equipment equipment = equipmentMapper.selectById(equipmentScrap.getEquipmentId());
 			if (equipment == null) {
 				return BaseResponse.errorMsg("信息错误!");

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java

@@ -15,6 +15,7 @@ import cn.wise.sc.cement.business.util.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.swagger.models.auth.In;
@@ -81,6 +82,14 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 		if(loginUser==null){
 			return BaseResponse.errorMsg("请登录账号");
 		}
+		if(StringUtils.isBlank(query.getWorkType())){
+			return BaseResponse.errorMsg("工作类型不能为空");
+		}
+
+		if(query.getReportedHours() == null){
+			return BaseResponse.errorMsg("工作类型不能为空");
+		}
+
 		NonStandardApply cama = new NonStandardApply();
 		BeanUtils.copyProperties(query, cama);
 		cama.setStatistical(cama.getStartTime() + "/" + cama.getEndTime());

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApprovalServiceImpl.java

@@ -81,9 +81,13 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
 			return BaseResponse.errorMsg("按钮参数不能为空");
 		}
 		if (query.getMenuId() == 1) {   //通过
+			if (query.getApprovalHours() == null) {
+				return BaseResponse.errorMsg("请填写审批工日");
+			}
 			nonStandardApproval.setApprovalHours(query.getApprovalHours());
 			//计算最终产值
 			Double finalValue = appraisalValueMapper.getAppraisalValue() * query.getApprovalHours();
+			finalValue = finalValue == null?0:finalValue;
 			nonStandardApproval.setFinalValue(finalValue);
 			nonStandardApproval.setStatus(2);
 		} else if (query.getMenuId() == 2) {  //拒绝

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java

@@ -109,19 +109,29 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 					finalNonStandardValue.setId(newId);
 
 					//只要进来这个if ===> 我拿到了李国庆的其中一条记录
-					Double houers = nonStandardValue.getApprovalHours().doubleValue();
-					Double newApprovalHours = nonStandardValue.getApprovalHours() + finalNonStandardValue.getApprovalHours();
-					//用新得到的最总工时覆盖掉原来的总工时===>累加
-					finalNonStandardValue.setApprovalHours(newApprovalHours);
-
-					Double RHhouers = nonStandardValue.getReportedHours().doubleValue();
-					Double newReportedHours = nonStandardValue.getReportedHours() + finalNonStandardValue.getReportedHours();
-					//用新得到的最总工时覆盖掉原来的总工时===>累加
-					finalNonStandardValue.setReportedHours(newReportedHours);
-
-					Double finalValue = nonStandardValue.getFinalValue().doubleValue();
-					Double newFinalValue = nonStandardValue.getFinalValue() + finalNonStandardValue.getFinalValue();
-					finalNonStandardValue.setFinalValue(newFinalValue);
+					if(nonStandardValue.getApprovalHours() != null &&
+							finalNonStandardValue.getApprovalHours() != null){
+						Double houers = nonStandardValue.getApprovalHours().doubleValue();
+						Double newApprovalHours = nonStandardValue.getApprovalHours() + finalNonStandardValue.getApprovalHours();
+						//用新得到的最总工时覆盖掉原来的总工时===>累加
+						finalNonStandardValue.setApprovalHours(newApprovalHours);
+					}
+
+					if(nonStandardValue.getReportedHours() != null &&
+							finalNonStandardValue.getReportedHours() != null){
+						Double RHhouers = nonStandardValue.getReportedHours().doubleValue();
+						Double newReportedHours = nonStandardValue.getReportedHours() + finalNonStandardValue.getReportedHours();
+						//用新得到的最总工时覆盖掉原来的总工时===>累加
+						finalNonStandardValue.setReportedHours(newReportedHours);
+					}
+					if(nonStandardValue.getFinalValue() != null &&
+							finalNonStandardValue.getFinalValue() != null){
+						Double finalValue = nonStandardValue.getFinalValue().doubleValue();
+						Double newFinalValue = nonStandardValue.getFinalValue() + finalNonStandardValue.getFinalValue();
+						finalNonStandardValue.setFinalValue(newFinalValue);
+
+					}
+
 				}
 			}
 			rts.add(finalNonStandardValue);

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ProjectServiceImpl.java

@@ -79,6 +79,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 		if(StringUtils.isBlank(query.getName())){
 			return BaseResponse.errorMsg("项目名称不可为空!");
 		}
+		if(StringUtils.isBlank(query.getCode())){
+			return BaseResponse.errorMsg("项目编号不可为空!");
+		}
 		QueryWrapper<Project> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		int count = projectMapper.selectCount(qw);
@@ -100,6 +103,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 		if(StringUtils.isBlank(query.getName())){
 			return BaseResponse.errorMsg("项目名称不可为空!");
 		}
+		if(StringUtils.isBlank(query.getCode())){
+			return BaseResponse.errorMsg("项目编号不可为空!");
+		}
 		//判断名字是否重复
 		QueryWrapper<Project> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java

@@ -89,7 +89,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
      */
     @Override
     public BaseResponse<IPage<Standard>> getPage(PageQuery pageQuery, String name, String supplierName) {
-        QueryWrapper<Standard> qw = new QueryWrapper<>();
+       /* QueryWrapper<Standard> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(name)) {
             qw.like("name", name);
         }
@@ -98,8 +98,14 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         }
         qw.orderByDesc("name");
         IPage<Standard> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-        page = standardMapper.selectPage(page, qw);
-        return BaseResponse.okData(page);
+        page = standardMapper.selectPage(page, qw);*/
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("name", name);
+        params.put("supplierName", supplierName);
+        Page<Standard> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+        IPage<Standard> pages = standardMapper.getPage(page, params);
+        return BaseResponse.okData(pages);
     }
 
     /**

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SupplierServiceImpl.java

 package cn.wise.sc.cement.business.service.impl;
 
-import cn.wise.sc.cement.business.entity.Supplier;
-import cn.wise.sc.cement.business.entity.SupplierEnclosure;
-import cn.wise.sc.cement.business.entity.SysUserEnclosure;
-import cn.wise.sc.cement.business.mapper.SupplierEnclosureMapper;
-import cn.wise.sc.cement.business.mapper.SupplierMapper;
+import cn.wise.sc.cement.business.entity.*;
+import cn.wise.sc.cement.business.mapper.*;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.SupplierQuery;
 import cn.wise.sc.cement.business.model.query.SupplierEnclosureQuery;
 import cn.wise.sc.cement.business.service.ISupplierService;
+import cn.wise.sc.cement.business.wrapper.page.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -156,6 +154,14 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 		return BaseResponse.okData(pages);
 	}
 
+
+	@Resource
+	private StandardMapper standardMapper;
+	@Resource
+	private EquipmentMapper equipmentMapper;
+	@Resource
+	private ConsumablesMapper consumablesMapper;
+
 	/**
 	 * 删除供应商附件
 	 * @param id
@@ -171,6 +177,24 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 		if(suppliernclosure == null){
 			return BaseResponse.errorMsg("附件信息错误");
 		}
+		QueryWrapper<Standard> standardQueryWrapper = new QueryWrapper<>();
+		standardQueryWrapper.eq("supplier_id",suppliernclosure.getId());
+		Integer standardCounts = standardMapper.selectCount(standardQueryWrapper);
+		if(standardCounts > 0 ){
+			return BaseResponse.errorMsg("有"+standardCounts+"个标样正在使用");
+		}
+		QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
+		equipmentQueryWrapper.eq("supplier_id",suppliernclosure.getId());
+		Integer equipmentCounts = equipmentMapper.selectCount(equipmentQueryWrapper);
+		if(equipmentCounts > 0 ){
+			return BaseResponse.errorMsg("有"+equipmentCounts+"个设备正在使用");
+		}
+		QueryWrapper<Consumables> consumablesQueryWrapper = new QueryWrapper<>();
+		consumablesQueryWrapper.eq("supplier_id",suppliernclosure.getId());
+		Integer consumablesCounts = consumablesMapper.selectCount(consumablesQueryWrapper);
+		if(consumablesCounts > 0 ){
+			return BaseResponse.errorMsg("有"+consumablesCounts+"个消耗品正在使用");
+		}
 		supplierEnclosureMapper.deleteById(id);
 		return BaseResponse.okData("附件信息删除成功");
 	}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java

@@ -268,7 +268,8 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 				.setIsDisplay(query.getIsDisplay())
 				.setQualifications(query.getQualifications())
 				.setHandleId(query.getHandleId())
-				.setIsParallel(query.getIsParallel());
+				.setIsParallel(query.getIsParallel())
+				.setIsPf(query.getIsPf());
 		teamMapper.updateById(update);
 		return BaseResponse.okData(update);
 	}