Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/controller/CapitalRepairController.java

@@ -89,6 +89,19 @@ public class CapitalRepairController {
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
+    /**
+     * @param request mtCompanyId 维保公司ID
+     * @return RestResponse 项目ID和名称列表
+     * @description 查询项目ID和名称列表
+     * @date 2020/4/30 10:41 上午
+     */
+    @PostMapping("projectIDList")
+    @Validation(fields = {"mtCompanyId"})
+    public RestResponse projectIDList(@Val @RequestBody CapitalRepairRequest request) {
+        List<Map<String, Object>> projectIDList = capitalRepairService.projectIDList(request);
+        return RestResponse.success(projectIDList, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param request 选择电梯列表查询条件
      * @return IPage<LiftResponse> 选择电梯列表

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/CapitalRepair.java

@@ -127,12 +127,6 @@ public class CapitalRepair extends BaseEntity {
     @FieldName(name = "项目原有结束时间")
     private LocalDate endDate;
 
-    /**
-     * 延期后的结束时间
-     */
-    @FieldName(name = "项目原有结束时间")
-    private LocalDate delayTime;
-
     /**
      * 逾期时间
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairService.java

@@ -65,9 +65,23 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @date 2020/2/3 11:38 上午
      */
     public IPage<CapitalRepairResponse> list(CapitalRepairRequest request) {
+        request.addDesc("end_date");
         return baseMapper.findByCondition(request.getPage(), request);
     }
 
+    /**
+     * @param request 维保公司ID
+     * @return List<Map<String,Object>> 项目ID和名称列表
+     * @description 项目ID和名称列表
+     * @date 2020/4/30 10:39 上午
+     */
+    public List<Map<String,Object>> projectIDList(CapitalRepairRequest request) {
+        QueryWrapper<CapitalRepair> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(request.getMtCompanyId()), "mt_company_id", request.getMtCompanyId());
+        queryWrapper.select("id projectId", "project_name projectName");
+        return listMaps(queryWrapper);
+    }
+
     /**
      * @param request 电梯列表查询条件
      * @return IPage<LiftResponse> 大修项目电梯列表
@@ -225,10 +239,9 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
         if (Objects.equals(0, request.getType())) {
             if (Objects.equals(0, request.getPass())) {
                 capitalRepair.setOverdueFlag(0);
+            } else {
+                capitalRepair.setOverdueFlag(1);
             }
-            //延期后的结束时间
-            capitalRepair.setDelayTime(capitalRepair.getOverdueDate());
-            capitalRepair.setOverdueFlag(1);
         }
         //竣工审核
         capitalRepair.setProjectStatus(Objects.equals(0, request.getPass()) ?

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -84,6 +84,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @date 2019/11/27 2:10 PM
      */
     public IPage<LiftResponse> list(LiftRequest request) {
+        request.addAsc("project_name");
         return baseMapper.findByCondition(request.getPage(), request);
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MaintenanceRecordRequest.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
 import cn.com.ty.lift.common.model.PageRequest;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
@@ -15,6 +16,7 @@ import java.time.LocalDate;
  * @description 保养信息请求
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class MaintenanceRecordRequest extends PageRequest {
     /**
      * 公司ID
@@ -56,11 +58,17 @@ public class MaintenanceRecordRequest extends PageRequest {
     private String coordinate;
 
     /**
-     * 当前日期
+     * 开始日期
      */
-    @NotNull(message = "当前日期不能为空")
+    @NotNull(message = "开始日期不能为空")
     private LocalDate currentTime;
 
+    /**
+     * 结束日期
+     */
+    @NotNull(message = "结束日期不能为空")
+    private LocalDate endTime;
+
     /**
      * 保养信息
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/response/ProjectDetailResponse.java

@@ -78,4 +78,9 @@ public class ProjectDetailResponse {
      * 是否维保班长
      */
     private String isMonitor;
+
+    /**
+     * 项目状态
+     */
+    private String projectStatus;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectAppService.java

@@ -128,6 +128,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     public Map<String, Object> planTask(MaintenanceRecordRequest request) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Long> countMap = new HashMap<>();
+        request.setEndTime(request.getCurrentTime().with(TemporalAdjusters.lastDayOfMonth()));
         IPage<MaintenanceAppResponse> page = maintenancePlanMapper.findPlanByWorkerId(request.getPage(), request);
 
         List<MaintenanceAppResponse> records = page.getRecords();
@@ -179,6 +180,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     public Map<String, Object> recordTask(MaintenanceRecordRequest request) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Long> countMap = new HashMap<>();
+        request.setEndTime(request.getCurrentTime().with(TemporalAdjusters.lastDayOfMonth()));
         IPage<MaintenanceAppResponse> page = maintenanceRecordMapper.findRecordByWorkerId(request.getPage(), request);
         List<MaintenanceAppResponse> records = page.getRecords();
         if (CollUtil.isNotEmpty(records)) {

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -86,6 +86,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @date 2019/11/27 2:10 PM
      */
     public IPage<ProjectResponse> list(ProjectRequest request) {
+        request.addDesc("project_status");
         return baseMapper.findByCondition(request.getPage(), request);
     }
 

lift-business-service/src/main/resources/mapper/capital/CapitalRepairLiftRelevanceMapper.xml

@@ -87,7 +87,8 @@
                     r.area_name     AS areaName,
                     r.clerk         AS clerk_id,
                     r.id            AS regionId,
-                    cr.pp_contact_id AS contact_id
+                    cr.pp_contact_id AS contact_id,
+                    cr.project_status AS projectStatus
         FROM capital_repair cr
                 LEFT JOIN region r ON cr.region_id = r.id
                 LEFT JOIN user_info ui ON r.user_id = ui.user_id

lift-business-service/src/main/resources/mapper/capital/CapitalRepairMapper.xml

@@ -19,7 +19,6 @@
         <result column="coordinate" property="coordinate" jdbcType="VARCHAR" />
         <result column="start_date" property="startDate" jdbcType="DATE" />
         <result column="end_date" property="endDate" jdbcType="DATE" />
-        <result column="delay_time" property="delayTime" jdbcType="DATE" />
         <result column="overdue_date" property="overdueDate" jdbcType="DATE" />
         <result column="overdue_reason" property="overdueReason" jdbcType="VARCHAR" />
         <result column="overdue_flag" property="overdueFlag" jdbcType="VARCHAR" />
@@ -35,7 +34,7 @@
     <sql id="Base_Column_List" >
         id, mt_company_id, pp_company_id, pp_contact_id, project_code, project_name, province_code, province,
 		city_code, city, district_code, district, project_address, project_usage, coordinate, start_date, end_date,
-        delay_time, overdue_date, overdue_reason, overdue_flag, project_status, push_flag, creator_id, create_date,
+        overdue_date, overdue_reason, overdue_flag, project_status, push_flag, creator_id, create_date,
         update_id, update_date, region_id
     </sql>
 

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -134,7 +134,10 @@
 			AND mp.status = #{request.status,jdbcType=VARCHAR}
 		</if>
 		<if test="request.currentTime!=null">
-			AND mp.plan_date = #{request.currentTime}
+			AND <![CDATA[ mp.plan_date >= #{request.currentTime}]]>
+		</if>
+		<if test="request.endTime!=null">
+			AND <![CDATA[ mp.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
 		</if>
 	</select>
 
@@ -152,7 +155,10 @@
 			AND pu.user_id = #{request.workerId,jdbcType=BIGINT}
 		</if>
 		<if test="request.currentTime!=null">
-			AND mp.plan_date = #{request.currentTime}
+			AND <![CDATA[ mp.plan_date >= #{request.currentTime}]]>
+		</if>
+		<if test="request.endTime!=null">
+			AND <![CDATA[ mp.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
 		</if>
 	</select>
 

lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -130,7 +130,10 @@
 			AND mr.status = #{request.status,jdbcType=VARCHAR}
 		</if>
         <if test="request.currentTime!=null">
-            AND mr.plan_date = #{request.currentTime}
+            AND <![CDATA[ mr.plan_date >= #{request.currentTime}]]>
+        </if>
+        <if test="request.endTime!=null">
+            AND <![CDATA[ mr.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
         </if>
 	</select>
 
@@ -147,7 +150,10 @@
             AND mr.worker_id1 = #{request.workerId,jdbcType=BIGINT}
         </if>
         <if test="request.currentTime!=null">
-            AND mr.plan_date = #{request.currentTime}
+            AND <![CDATA[ mr.plan_date >= #{request.currentTime}]]>
+        </if>
+        <if test="request.endTime!=null">
+            AND <![CDATA[ mr.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
         </if>
     </select>