Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairSchemeDTO.java

@@ -94,4 +94,11 @@ public class RepairSchemeDTO extends BaseDTO implements Serializable {
      */
     private String keyword;
 
+    private String sbId; // 维修设备ID
+
+    private String sbPartId; // 维修设备部位ID
+
+    private String errorTypeId; // 异常类别
+
+    private String errorContent; // 故障描述
 }

platform-dao/src/main/java/com/platform/dao/dto/sb/SbModelSpareBomDTO.java

@@ -82,6 +82,7 @@ public class SbModelSpareBomDTO extends BaseDTO implements Serializable {
     private Integer periodType;
     /**
      * 备件id
+     * =-备件名称
      */
     private String spareId;
     /**
@@ -123,4 +124,9 @@ public class SbModelSpareBomDTO extends BaseDTO implements Serializable {
 
     private Integer isSpecial;
 
+    // 新增字段
+    private String no; // 备件编码
+
+    private String ggxh; // 备件规格
+
 }

platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartUsedDTO.java

@@ -157,4 +157,7 @@ public class SparePartUsedDTO extends BaseDTO implements Serializable {
      */
     private Integer sparePeriod; // 备件寿命
 
+    private String no; // 备件编码
+
+    private String ggxh; // 规格型号
 }

platform-dao/src/main/java/com/platform/dao/entity/activiti/LocalAuditRecord.java

@@ -76,8 +76,14 @@ public class LocalAuditRecord implements Serializable {
 
     private LocalDateTime updateTime;
 
+    /**
+     * 借用作为状态
+     */
     private String updateUserId;
 
+    /**
+     * 借用作为申请人
+     */
     private String updateUserName;
 
     /**

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairScheme.java

@@ -37,14 +37,6 @@ public class RepairScheme implements Serializable {
      * 维修意见
      */
     private String opinion;
-    /**
-     * 维修意见图
-     */
-    //private String imageList;
-    /**
-     * 维修方案文件
-     */
-    //private String opinionFile;
     /**
      * 方案提供者ID
      */
@@ -83,5 +75,13 @@ public class RepairScheme implements Serializable {
      */
     @Transient
     private DataScope dataScope;
+    // 新增字段
+    private String sbId; // 维修设备ID
+
+    private String sbPartId; // 维修设备部位ID
+
+    private String errorTypeId; // 异常类别
+
+    private String errorContent; // 故障描述
 
 }

platform-dao/src/main/java/com/platform/dao/entity/sb/SbModelSpareBom.java

@@ -109,5 +109,6 @@ public class SbModelSpareBom implements Serializable {
     private String spareName; // 备件名称
     private String ggxh;  // 规格型号
     private Integer sparePeriod; // 备件寿命期限（天）
+    private String no; // 备件编码
 
 }

platform-dao/src/main/java/com/platform/dao/entity/sqarepartmanage/SparePartUsed.java

@@ -66,6 +66,7 @@ public class SparePartUsed implements Serializable {
     private BigDecimal totalPrice;
     /**
      * 设备id
+     * --龙岩的备件编码
      */
     private String spareId;
     /**

platform-dao/src/main/java/com/platform/dao/vo/query/repair/RepairSchemeVO.java

@@ -80,5 +80,14 @@ public class RepairSchemeVO extends BaseVO implements Serializable {
 
     private String repairNo;
 
+    // 新增字段
+    private String sbId; // 维修设备ID
 
+    private String sbPartId; // 维修设备部位ID
+
+    private String errorTypeId; // 异常类别
+
+    private String errorContent; // 故障描述
+
+    private String sbName; // 设备名称
 }

platform-dao/src/main/resources/mapper/activiti/LocalAuditRecordMapper.xml

@@ -104,7 +104,7 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.activiti.LocalAuditRecordDTO"
             resultType="com.platform.dao.vo.query.activiti.LocalAuditRecordVO">
-        select store.*,data.status,data.created_user_name as userName from t_local_audit_record as store join t_custom_field_template_data data on store.target_id = data.id
+        select store.*,data.status,data.created_user_name as userName from t_local_audit_record as store left join t_custom_field_template_data data on store.target_id = data.id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-dao/src/main/resources/mapper/repair/RepairSchemeMapper.xml

@@ -43,7 +43,7 @@
             and repair.update_user_name = #{updateUserName}
         </if>
         <if test="createdTimeStart != null">
-            and repair.created_time <![CDATA[>=]]>; #{createdTimeStart}
+            and repair.created_time <![CDATA[>=]]> #{createdTimeStart}
         </if>
         <if test="createdTimeEnd != null">
             and repair.created_time <![CDATA[<=]]> #{createdTimeEnd}
@@ -52,7 +52,7 @@
             and repair.created_time = #{createdTime}
         </if>
         <if test="updateTimeStart != null">
-            and repair.update_time <![CDATA[>=]]>; #{updateTimeStart}
+            and repair.update_time <![CDATA[>=]]>#{updateTimeStart}
         </if>
         <if test="updateTimeEnd != null">
             and repair.update_time <![CDATA[<=]]> #{updateTimeEnd}
@@ -66,14 +66,20 @@
         <if test="deleteFlag != null">
             and repair.delete_flag = #{deleteFlag}
         </if>
+        <if test="sbId != null and sbId != ''">
+            and repair.sb_id = #{sbId}
+        </if>
+        <if test="errorTypeId != null and errorTypeId != ''">
+            and repair.error_type_id  = #{errorTypeId}
+        </if>
         <if test="keyword != null and keyword != ''">
-            and repair.id like concat(concat('%',#{keyword}),'%')
+            and repair.error_content like concat(concat('%',#{keyword}),'%')
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.repair.RepairSchemeDTO"
             resultType="com.platform.dao.vo.query.repair.RepairSchemeVO">
-        select repair.*
-        from t_repair_scheme as repair
+        select repair.*,sb.name as sbName
+        from t_repair_scheme as repair join t_sb_info sb on repair.sb_id = sb.id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-dao/src/main/resources/mapper/sb/SbModelSpareBomMapper.xml

@@ -59,8 +59,8 @@
 
     <select id="selectLongYanVOList" parameterType="com.platform.dao.dto.store.SpareStoreDTO"
             resultType="com.platform.dao.vo.query.store.SpareStoreVO">
-        select
-        spare.name as spareName,spare.no as no,spare.ggxh as ggxh from t_sb_model_spare_bom bom join t_spare_part_info spare on bom.spare_id = spare.id
+        select bom.id,
+        bom.spare_name as spareName,bom.no as no,bom.ggxh as ggxh from t_sb_model_spare_bom bom
         <where>
             <if test="spareId != null">
                 and bom.spare_id = #{spareId}

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -106,9 +106,9 @@ public class RepairApplicationFormController {
             repairApplicationFormService.modModelByDTO(repairApplicationFormDTO);
         }
         // 需要发起
-        if(!repairApplicationFormDTO.getRepairDeptId().equals(repairApplicationFormDTO.getOldRepairDeptId())){
+        /*if(!repairApplicationFormDTO.getRepairDeptId().equals(repairApplicationFormDTO.getOldRepairDeptId())){
             RepairStrategyFactory.getStrategy().callRepairAgain(repairApplicationFormDTO);
-        }
+        }*/
         return new R<>();
     }
 

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairSchemeController.java

@@ -71,6 +71,16 @@ public class RepairSchemeController {
       return new R<>();
   }
 
+  /**
+   * 复制方案
+   * @return R
+   */
+  @SysLog("复制维修方案")
+  @PutMapping("/{id}/{repairId}")
+  public R copy(@PathVariable("id") String id, @PathVariable("repairId") String repairId) {
+    repairSchemeService.copyScheme(id,repairId);
+    return new R<>("获取成功");
+  }
 
 
   /**

platform-rest/src/main/java/com/platform/rest/controller/sb/SbModelSpareBomController.java

@@ -109,7 +109,7 @@ public class SbModelSpareBomController {
     public R save(@Validated({AddGroup.class}) @RequestBody List<SbModelSpareBomDTO> sbModelSpareBomDTOList) throws Exception {
         for(SbModelSpareBomDTO sbModelSpareBomDTO:sbModelSpareBomDTOList ){
             SbModelSpareBomDTO d = new SbModelSpareBomDTO();
-            d.setSpareId(sbModelSpareBomDTO.getSpareId());
+            d.setNo(sbModelSpareBomDTO.getNo());
             if(StringUtils.isNotBlank(sbModelSpareBomDTO.getSbId())){
                 d.setSbId(sbModelSpareBomDTO.getSbId());
             }
@@ -238,8 +238,9 @@ public class SbModelSpareBomController {
   @SysLog("查询设备型号bom")
   @GetMapping("model/{modelId}")
  public R selectSpareInfoListByModelId(@PathVariable String modelId) {
-    List<SparePartInfoVO> list =  sparePartInfoService.selectSpareInfoListByModelId(modelId);
-    return new R<>(list);
+      SbModelSpareBomDTO dto = new SbModelSpareBomDTO();
+      dto.setModelId(modelId);
+      return new R<>(sbModelSpareBomService.getModelListByDTO(dto));
   }
 
     /**

platform-service/src/main/java/com/platform/service/activiti/impl/LocalAuditRecordServiceImpl.java

@@ -3,6 +3,7 @@ package com.platform.service.activiti.impl;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.util.SecurityUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.activiti.LocalAuditRecordDTO;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
@@ -40,7 +41,16 @@ public class LocalAuditRecordServiceImpl extends BaseServiceImpl<LocalAuditRecor
     public AbstractPageResultBean<LocalAuditRecordVO> selectPageList(LocalAuditRecordDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         record.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
-        return new MyPage(mapper.selectList(record));
+        AbstractPageResultBean<LocalAuditRecordVO> pageInfos = new MyPage(mapper.selectList(record));
+        if(pageInfos != null && pageInfos.getRows() != null){
+            for(LocalAuditRecordVO vo : pageInfos.getRows()){
+                if(vo.getStatus() == null){
+                    vo.setStatus(StringUtils.isBlank(vo.getUpdateUserId()) ? null : Integer.parseInt(vo.getUpdateUserId()));
+                    vo.setUserName(vo.getUpdateUserName());
+                }
+            }
+        }
+        return pageInfos;
     }
 
     @Override

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -1,31 +1,22 @@
 package com.platform.service.business.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.platform.activiti.dao.entity.ActAuditRequest;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.constant.CommonConstants;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.IdGeneratorUtils;
-import com.platform.common.util.JsonUtils;
-import com.platform.dao.dto.activiti.SbScrapFormActiviti;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
-import com.platform.dao.entity.customize.CustomFieldTemplateData;
-import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.ActivitiFormStatusEnum;
-import com.platform.dao.enums.CustomFieldTemplateDataStatusEnum;
 import com.platform.dao.enums.OutStoreStatusEnum;
-import com.platform.dao.enums.SbInfoStatusEnum;
 import com.platform.dao.mapper.activiti.LocalAuditRecordMapper;
-import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
-import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
 import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
 import com.platform.service.customize.BaseFormCheckServiceAbstract;
 import com.platform.service.yongyou.YongyouService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -121,10 +112,26 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
         outStoreForm.setId(actAuditRequest.getId());
         outStoreForm.setStatus(OutStoreStatusEnum.EXECUTING.getValue());
         outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
-        yongyouService.addOutForm(actAuditRequest.getId());
+        //yongyouService.addOutForm(actAuditRequest.getId());
+        YongYouThread yongYouThread = new YongYouThread();
+        yongYouThread.setId(actAuditRequest.getId());
+        yongYouThread.start();
         return null;
     }
 
+    class YongYouThread extends Thread {
+        private String id;
+
+        public void setId(String id){
+            this.id = id;
+        }
+
+        @Override
+        public void run() {
+            yongyouService.addOutForm(id);
+        }
+    }
+
     /**
      * 终止审批业务
      * 清空：processInstanceId
@@ -147,10 +154,12 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
         record.setId(IdGeneratorUtils.getObjectId());
         record.setNo(outStoreForm.getOutNo());
         record.setProcessInstanceId(actAuditRequest.getProcessInstanceId());
-        record.setTargetCode(outStoreForm.getRemark());
+        record.setTargetCode(CommonConstants.OUT_STORE_BACK);
         record.setTargetId(actAuditRequest.getId());
         record.setSelf(user.getUserId().equals(outStoreForm.getCreatedUserId()) ? Boolean.TRUE : Boolean.FALSE);
         record.setFlag(result == 0 ? false : true);
+        record.setUpdateUserName(outStoreForm.getCreatedUserName()); // 申请人
+        record.setUpdateUserId(ActivitiFormStatusEnum.FINISH.getValue() + ""); // 审批状态
         localAuditRecordMapper.insertSelective(record);
     }
 }

platform-service/src/main/java/com/platform/service/repair/RepairSchemeService.java

@@ -48,4 +48,11 @@ public interface RepairSchemeService extends IBaseService<RepairScheme, RepairSc
     void updateByDTO(RepairSchemeDTO model);
 
     RepairSchemeVO getVOById(String id);
+
+ /**
+  * 方案复制
+  * @param id 被复制方案ID
+  * @param repairId
+  */
+ void copyScheme(String id,String repairId);
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairSchemeServiceImpl.java

@@ -2,6 +2,7 @@ package com.platform.service.repair.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.exception.DeniedException;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.ListUtils;
@@ -97,6 +98,26 @@ public class RepairSchemeServiceImpl extends BaseServiceImpl<RepairSchemeMapper,
         return model;
     }
 
+    @Override
+    public void copyScheme(String id, String repairId) {
+        RepairScheme scheme = mapper.selectByPrimaryKey(id);
+        if(scheme == null){
+            throw new DeniedException("待获取方案失败，该方案不存在");
+        }
+        RepairScheme copyScheme = BeanConverterUtil.copyObjectProperties(scheme,RepairScheme.class);
+        copyScheme.setId(IdGeneratorUtils.getObjectId());
+        copyScheme.setRepairId(repairId);
+        copyScheme.setCreatedTime(LocalDateTime.now());
+        copyScheme.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
+        copyScheme.setCreatedUserName(SecurityUtils.getUserInfo().getUsername());
+        copyScheme.setUpdateTime(null);
+        copyScheme.setUpdateUserId(null);
+        copyScheme.setUpdateUserName(null);
+        RepairApplicationForm form = repairApplicationFormMapper.selectByPrimaryKey(repairId);
+        copyScheme.setSbId(form.getSbId());
+        mapper.insert(copyScheme);
+    }
+
     @Override
     public AbstractPageResultBean<RepairScheme> selectPageInfo(RepairSchemeDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -92,6 +92,9 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
 
     private String getReportLeaderId(String sbId){
         String positionId = sbInfoService.getById(sbId).getPositionId();
+        if(StringUtils.isBlank(positionId)){
+            throw new DeniedException("该设备的设备位置尚未设置，请设置");
+        }
         return sbPositionMapper.getById(positionId).getUserId();
     }
 

platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartUsedServiceImpl.java

@@ -345,19 +345,10 @@ public class SparePartUsedServiceImpl extends BaseServiceImpl<SparePartUsedMappe
             mapper.updateRecordToOld(updDTO);
         }*/
         // 待插入更换记录
-        /*List<SparePartUsed> saveList = new ArrayList<>();
+        List<SparePartUsed> saveList = new ArrayList<>();
         // 区分是否bom关联备件
         for(SparePartUsedDTO sparePartUsedDTO : sparePartUsedDTOList){
             int isSpecial = sparePartUsedDTO.getIsSpecial() == null ? 0 : sparePartUsedDTO.getIsSpecial();
-            // 获取old id
-            SparePartUsed oldUsed = new SparePartUsed();
-            oldUsed.setSbId(sparePartUsedDTO.getSbId());
-            oldUsed.setSpareId(sparePartUsedDTO.getSpareId());
-            oldUsed.setStatus(SparePartUsedStatusEnum.IN_USE.getValue());
-            oldUsed = mapper.selectOne(oldUsed);
-            if(oldUsed != null){
-                ids.add(oldUsed.getId());
-            }
             // 封装新增更换记录
             SparePartUsed entity = BeanConverterUtil.copyObjectProperties(sparePartUsedDTO, SparePartUsed.class);
             entity.setId(IdGeneratorUtils.getObjectId());
@@ -368,26 +359,17 @@ public class SparePartUsedServiceImpl extends BaseServiceImpl<SparePartUsedMappe
                 entity.setCreatedUserId(userInfo.getUserId());
                 entity.setCreatedUserName(userInfo.getRealName());
             }
-            LocalDate now = LocalDate.now();
-            entity.setStartDate(now);
-            entity.setIsSpecial(isSpecial);
-            // 计算下次更换时间
-            if(sparePartUsedDTO.getSparePeriod() != null && sparePartUsedDTO.getSparePeriod() > 0){
-                entity.setChangeDate(now.plusDays(sparePartUsedDTO.getSparePeriod()));
+            entity.setSpareId(sparePartUsedDTO.getNo()); // 备件编码
+            if(entity.getStartDate() == null){
+                entity.setStartDate(LocalDate.now());
             }
+            entity.setIsSpecial(isSpecial);
             saveList.add(entity);
-
         }
         // 保存更换记录
         if(saveList.size() > 0){
             mapper.insertListforComplex(saveList);
         }
-        // 将之前记录修改为历史和实际更换时间
-        if(ids.size() > 0){
-            SparePartUsedDTO updDTO = new SparePartUsedDTO();
-            updDTO.setTypeIds(ids);
-            mapper.updateRecordToOld(updDTO);
-        }*/
     }
 
     @Override