Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java

@@ -79,6 +79,12 @@ public class BmProjectInfo {
   @Excel(name = "工程类型")
   @ApiModelProperty(value = "工程类型名称")
   private String typeName;
+  @ApiModelProperty(value = "经度")
+  private String longitude;
+  @ApiModelProperty(value = "纬度")
+  private String latitude;
+  @ApiModelProperty(value = "地址")
+  private String address;
 
   /** 导出选中列表 */
   private List<Long> dataCondition;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectLot.java

@@ -141,6 +141,12 @@ public class BmProjectLot {
     @Excel(name = "工程类型")
     @ApiModelProperty(value = "工程类型名称")
     private String typeName;
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+    @ApiModelProperty(value = "地址")
+    private String address;
 
     /** 导出选中列表 */
     private List<Long> dataCondition;

sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml

@@ -167,6 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">company_id,</if>
             <if test="startDate != null and startDate != ''">start_date,</if>
             <if test="completionDate != null and completionDate != ''">completion_date,</if>
+            <if test="longitude != null and longitude != ''">longitude,</if>
+            <if test="latitude != null and latitude != ''">latitude,</if>
+            <if test="address != null and address != ''">address,</if>
             create_time
         )values(
 			<if test="proName != null and proName != ''">#{proName},</if>
@@ -182,6 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">#{companyId},</if>
             <if test="startDate != null and startDate != ''">#{startDate},</if>
             <if test="completionDate != null and completionDate != ''">#{completionDate},</if>
+            <if test="longitude != null and longitude != ''">#{longitude},</if>
+            <if test="latitude != null and latitude != ''">#{latitude},</if>
+            <if test="address != null and address != ''">#{address},</if>
             sysdate()
 		)
     </insert>

sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml

@@ -37,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getProjectLotAll"  parameterType="com.bonus.sgzb.base.domain.BmProjectLot" resultMap="BmProjectLotResult">
         <!--<include refid="bmProjectInfo"/>-->
         select a.lot_id, a.pro_id, a.lot_name, a.status, a.type_id, a.link_man, a.telphone, a.own_pro, a.dept_id, a.is_share,
-        a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date
+        a.lon, a.lat, a.del_flag, a.create_by, a.create_time,a.remark,a.company_id ,b.dept_name, c.name,a.start_date,a.completion_date,
+        a.longitude,a.latitude,a.address
         from bm_project_lot a
         left join sys_dept b on a.dept_id = b.dept_id
         left join sys_dic c on a.type_id = c.id
@@ -117,6 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">company_id,</if>
             <if test="startDate != null and startDate != ''">start_date,</if>
             <if test="completionDate != null and completionDate != ''">completion_date,</if>
+            <if test="longitude != null and longitude != ''">longitude,</if>
+            <if test="latitude != null and latitude != ''">latitude,</if>
+            <if test="address != null and address != ''">address,</if>
             create_time
         )values(
 			<if test="lotName != null and lotName != ''">#{lotName},</if>
@@ -134,6 +138,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">#{companyId},</if>
             <if test="startDate != null and startDate != ''">#{startDate},</if>
             <if test="completionDate != null and completionDate != ''">#{completionDate},</if>
+            <if test="longitude != null and longitude != ''">#{longitude},</if>
+            <if test="latitude != null and latitude != ''">#{latitude},</if>
+            <if test="address != null and address != ''">#{address},</if>
             sysdate()
 		)
     </insert>
@@ -155,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
             <if test="startDate != null and startDate != ''">start_date = #{startDate},</if>
             <if test="completionDate != null and completionDate != ''">completion_date = #{completionDate},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
             update_time = sysdate()
         </set>
         where lot_id = #{lotId}

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java

@@ -163,6 +163,7 @@ public interface ScrapApplyDetailsMapper {
      * @return
      */
     int updateStatus(ScrapApplyDetails bean);
+    int updateStatusThree(ScrapApplyDetails bean);
 
     String getRepairId(ScrapApplyDetails scrapApplyDetails);
 

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java

@@ -92,7 +92,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
         //判断提交表单中是否存在相同编码
         for (int i = 0; i < machIneDtoList.size() - 1; i++) {
             for (int j = i + 1; j < machIneDtoList.size(); j++) {
-                if (machIneDtoList.get(i).getMaCode().equals(machIneDtoList.get(j).getMaCode())) {
+                if (StringUtils.isNotBlank(machIneDtoList.get(i).getMaCode()) && StringUtils.isNotBlank(machIneDtoList.get(j).getMaCode()) && machIneDtoList.get(i).getMaCode().equals(machIneDtoList.get(j).getMaCode())) {
                     throw new ServiceException("列表中包含以下相同的设备编码，请修改后重新提交：" + machIneDtoList.get(i).getMaCode());
                 }
             }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java

@@ -369,6 +369,11 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
             } else {
                 task.setTaskStatus(Integer.valueOf(TaskStatusEnum.SCRAP_PASSED.getCode()));
                 task.setDisposition(Integer.valueOf(TaskStatusEnum.NOT_DISPOSED.getCode()));
+                // 修改scrap_apply_details表状态
+                ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails();
+                scrapApplyDetails.setStatus("3");
+                scrapApplyDetails.setTaskId(scrapAuditorSet.getTaskId().longValue());
+                scrapApplyDetailsMapper.updateStatusThree(scrapApplyDetails);
             }
             //修改任务状态
             taskMapper.updateTmTask(task);

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml

@@ -232,7 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     <update id="updateRepairCost">
         update repair_cost
-        set part_type = #{status}
+        set part_type = #{status},status = '3'
         where repair_id = #{inputDetails.repairId}
     </update>
 

sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml

@@ -662,6 +662,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SET num = (IFNULL(num, 0)) + #{backNum}
         WHERE type_id = #{typeId}
     </update>
+    <update id="updateStatusThree">
+        update scrap_apply_details
+        set status = #{status}
+        where task_id = #{taskId}
+    </update>
 
     <select id="selectTypeNameByTaskId" resultType="java.lang.String">
         select GROUP_CONCAT(type_name) typeName from

sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml

@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
         left join ma_type mt on rc.type_id = mt.type_id
         left join ma_type mt1 on mt.parent_id = mt1.type_id
-        where rc.status in ('0','1')
+        where rc.status in ('3')
         <if test="taskList != null and taskList.size() > 0">
             and rc.task_id in
             <foreach item="task" collection="taskList" open="(" separator="," close=")">
@@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
         left join ma_type mt on sad.type_id = mt.type_id
         left join ma_type mt1 on mt.parent_id = mt1.type_id
-        where 1=1
+        where 1=1 and sad.status = '3'
         <if test="taskList != null and taskList.size() > 0">
             and sad.task_id in
             <foreach item="task" collection="taskList" open="(" separator="," close=")">