样品处理完成 和 样品检测完成接口 调用计算产值的接口

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

@@ -31,6 +31,9 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
 	List<SampleDistributionTeamVo> getDistributionTeamList(@Param("sampleId") Integer sampleId,
 	                                                       @Param("userId") Integer userId);
 
+	List<SampleDistributionTeamVo> getDistributionTeamGroupList(@Param("sampleId") Integer sampleId,
+	                                                       @Param("userId") Integer userId);
+
 	List<SampleCheckGroupVo> getSampleCheckGroupList(@Param("sampleId") Integer sampleId);
 
 	List<EntrustSample> getEntrustSample();

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

@@ -75,6 +75,20 @@
         order by t.id asc
     </select>
 
+    <select id="getDistributionTeamGroupList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo">
+        select t.id as distributionId, su.id as userId,
+        t.team_group_id as teamGroupId
+        from sample_distribution t
+        left join sys_user su on su.id = t.user_id
+        left join team s on s.id = t.team_id
+        left join team_group tg on tg.id = t.team_group_id
+        where t.sample_id = #{sampleId}
+        <if test="userId != null">
+            and t.user_id = #{userId}
+        </if>
+        group by t.team_group_id
+    </select>
+
     <select id="getSampleCheckGroupList" resultType="cn.wise.sc.cement.business.model.vo.SampleCheckGroupVo">
         select sd.team_group_id as teamGroupId, tg.name as teamGroupName,
 				sd.user_id as userId, su.name as userName

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

@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 import net.bytebuddy.description.field.FieldDescription;
+import org.apache.commons.io.filefilter.FalseFileFilter;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -114,6 +115,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
     private ISysUserMessageService userMessageService;
     @Autowired
     private WeiXinService weiXinService;
+    @Autowired
+    IPrecipriceService iNormProductionService;
 
 
     /**
@@ -1229,6 +1232,13 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             if (entrust == null) {
                 return BaseResponse.errorMsg("委托信息错误");
             }
+            //计算产值
+            if (sampleHandle.getContent() != null) {
+                String[] handIdS = sampleHandle.getContent().split("、");
+                for (String handleId : handIdS) {
+                    iNormProductionService.createPreciprice(sampleHandle.getUserId(),entrust.getId(),Integer.valueOf(handleId),0,sample.getId());
+                }
+            }
             QueryWrapper<SampleHandle> sampleHandleWrapper = new QueryWrapper<>();
             sampleHandleWrapper.eq("sample_id", sample.getId());
             sampleHandleWrapper.ne("status", 2);
@@ -1543,6 +1553,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             return BaseResponse.errorMsg("参数错误");
         }
         Entrust entrust = null;
+        //样品计算过产值的List
+        List<Integer> sampleIdS = new ArrayList<>();
         for (Integer id : ids) {
             SampleDistribution distribution = distributionMapper.selectById(id);
             if (distribution == null) {
@@ -1576,11 +1588,22 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                     entrust.setStatus(6);
                 }
                 entrustMapper.updateById(entrust);
+                //计算产值
+                if(!sampleIdS.contains(sample.getId())){
+                    List<SampleDistributionTeamVo> sampleDistributionTeamGroupVoList = distributionMapper.getDistributionTeamGroupList(sample.getId(), loginUser.getId());
+                    if (sampleDistributionTeamGroupVoList != null && sampleDistributionTeamGroupVoList.size() > 0) {
+                        for (SampleDistributionTeamVo sdVo : sampleDistributionTeamGroupVoList) {
+                            iNormProductionService.createPreciprice(sdVo.getUserId(),entrust.getId(),sdVo.getTeamGroupId(),1,sample.getId());
+                        }
+                    }
+                    sampleIdS.add(sample.getId());
+                }
             }
         }
         if (entrust == null) {
             return BaseResponse.errorMsg("委托信息错误");
         }
+
         logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "完成检测项目任务", null);
         return BaseResponse.okMsg("已完成检测项目任务");
     }