接口更新--shizhilong

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/algorithm/AnalysisAlgorithmLine.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.modules.checkData.entity.*;
 import org.jeecg.modules.checkData.service.*;
@@ -409,6 +411,11 @@ public class AnalysisAlgorithmLine {
         unit.setUnitStartMileage(checkDataMap.getStartingMileage());
         unit.setUnitEndMileage(checkDataMap.getEndMileage());
         unit.setWorkStatus(1);
+        //获取当前登录人信息
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String realname = user.getUsername();
+        unit.setCreateBy(realname);
+        unit.setUpdateBy(realname);
         //线路巡查主表
         RecordPatrolMaster recordPatrolMaster = recordPatrolMasterService.getById(checkDataMap.getEkId());
         if (recordPatrolMaster != null) {
@@ -451,6 +458,11 @@ public class AnalysisAlgorithmLine {
         unit.setWorkStatus(1);
         unit.setMarkStatus(1);
         unit.setRemark(analysisLineBatch.getRemark());
+        //获取当前登录人信息
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String realname = user.getUsername();
+        unit.setCreateBy(realname);
+        unit.setUpdateBy(realname);
         unitList.add(unit);
         return unit.getId();
     }
@@ -482,6 +494,11 @@ public class AnalysisAlgorithmLine {
         unit.setUnitEndMileage(new BigDecimal(map.get("endMileage").toString()));
         unit.setWorkStatus(1);
         unit.setMarkStatus(1);
+        //获取当前登录人信息
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String realname = user.getUsername();
+        unit.setCreateBy(realname);
+        unit.setUpdateBy(realname);
         unit.setRemark(analysisLineBatch.getRemark());
         unitList.add(unit);
         return unit.getId();

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchInfoDTO.java

@@ -30,6 +30,9 @@ public class AnalysisLineBatchInfoDTO {
     @ApiModelProperty("单元编号")
     private String unitCode;
 
+    @ApiModelProperty("设备编号")
+    private String unitDeviceCode;
+
     @ApiModelProperty("派工状态（1：未派工，2：已派工）")
     private Integer workStatus;
 

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchMapper.xml

@@ -106,6 +106,9 @@
         <if test="dto.unitCode != null and dto.unitCode != ''">
             AND t1.unit_code like concat('%',#{dto.unitCode},'%')
         </if>
+        <if test="dto.unitDeviceCode != null and dto.unitDeviceCode != ''">
+            AND t1.unit_device_code like concat('%',#{dto.unitDeviceCode},'%')
+        </if>
         <if test="dto.analysisBatchId != null and dto.analysisBatchId != ''">
             AND t1.analysis_batch_id = #{dto.analysisBatchId}
         </if>