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

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

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.business.capital.dao.entity.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/4/21
+ * @description 大修项目开始
+ */
+@Data
+public class CapitalBeginRequest {
+
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "notEmpty")
+    private Long id;
+}

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

@@ -27,6 +27,19 @@ public class CapitalRepairResponse {
      * 竣工时间
      */
     private LocalDate endDate;
+    /**
+     * 逾期时间
+     */
+    private LocalDate overdueDate;
+
+    /**
+     * 逾期原因
+     */
+    private String overdueReason;
+    /**
+     * 竣工单地址
+     */
+    private String imgUrl;
     /**
      * 区域id
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/mapper/CapitalRepairLiftRelevanceMapper.java

@@ -3,7 +3,9 @@ package cn.com.ty.lift.business.capital.dao.mapper;
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepairLiftRelevance;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalLiftRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectCompanyResponse;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectDetailResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectLiftResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,4 +33,12 @@ public interface CapitalRepairLiftRelevanceMapper extends BaseMapper<CapitalRepa
      * @date 2019/12/31 4:23 PM
      */
     IPage<ProjectCompanyResponse> findCapitalListByCompanyId(IPage<ProjectCompanyResponse> page, @Param("request") CompanyRequest request);
+
+    /**
+     * @param request 项目id
+     * @return ProjectDetailResponse 项目详情
+     * @description 根据项目id查询项目详情
+     * @date 2020/4/21 9:13 下午
+     */
+    ProjectDetailResponse findProjectById(@Param("request") ProjectDetailRequest request);
 }

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

@@ -1,10 +1,7 @@
 package cn.com.ty.lift.business.capital.service;
 
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
-import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairApplyRequest;
-import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairAuditRequest;
-import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairExtensionRequest;
-import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.*;
 import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairResponse;
 import cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairMapper;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
@@ -13,10 +10,10 @@ import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResp
 import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -140,6 +137,19 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
         return updateById(capitalRepair);
     }
 
+    /**
+     * @param request 项目id，公司id
+     * @return Integer 成功1或失败0
+     * @description 大修项目开始
+     * @date 2020/4/21 3:13 下午
+     */
+    public boolean begin(CapitalBeginRequest request) {
+        CapitalRepair capitalRepair = getOne(request.getId());
+        if (ObjectUtil.isEmpty(capitalRepair)) return false;
+        capitalRepair.setProjectStatus(CapitalRepairStatus.ABUILDING.getCode());
+        return updateById(capitalRepair);
+    }
+
     /**
      * @param request 逾期原因，逾期时间
      * @return Integer 成功1或失败0
@@ -147,8 +157,8 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @date 2020/4/15 11:34 上午
      */
     public boolean overdueApply(CapitalRepairApplyRequest request) {
-        CapitalRepair capitalRepair = new CapitalRepair();
-        capitalRepair.setId(request.getId());
+        CapitalRepair capitalRepair = getOne(request.getId());
+        if (ObjectUtil.isEmpty(capitalRepair)) return false;
         capitalRepair.setOverdueDate(request.getOverdueDate());
         capitalRepair.setOverdueReason(request.getOverdueReason());
         capitalRepair.setOverdueFlag(1);

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/Payment.java

@@ -119,10 +119,10 @@ public class Payment extends BaseEntity {
 	/**
 	 * 项目名称
 	 */
-	private String CostName;
+	private String costName;
 
 	/**
 	 * 项目描述
 	 */
-	private String CostDesc;
+	private String costDesc;
 }

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

@@ -31,7 +31,7 @@ public class PaymentListResponse {
     /**
      * 收款单号
      */
-    private String code;
+    private String paymentCode;
     /**
      * 应收金额
      */

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.project.controller;
 
 import cn.com.ty.lift.business.capital.dao.entity.SignIn;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.AttendanceListRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalBeginRequest;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalLiftRequest;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairApplyRequest;
 import cn.com.ty.lift.business.capital.service.CapitalRepairService;
@@ -213,6 +214,21 @@ public class ProjectAppController {
        return signInService.signIn(entry);
     }
 
+    /**
+     * @param request 项目id
+     * @return Integer 成功1或失败0
+     * @description 大修项目开始
+     * @date 2020/4/21 3:13 下午
+     */
+    @PostMapping("capital/begin")
+    public RestResponse begin(@Valid @RequestBody CapitalBeginRequest request) {
+        boolean result = capitalRepairService.begin(request);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+    }
+
     /**
      * @param request 逾期原因，逾期时间
      * @return Integer 成功1或失败0
@@ -272,4 +288,19 @@ public class ProjectAppController {
         }
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
+
+    /**
+     * @param request 项目id
+     * @return RestResponse 项目详情
+     * @description 根据项目id查询项目详情
+     * @date 2020/4/21 9:13 下午
+     */
+    @PostMapping("capital/project/detail")
+    public RestResponse capitalDetail(@Valid @RequestBody ProjectDetailRequest request) {
+        ProjectDetailResponse response = projectAppService.capitalDetail(request);
+        if (ObjectUtil.isEmpty(response)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(response, MessageUtils.get("msg.query.detail.success"));
+    }
 }

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

@@ -69,11 +69,7 @@ public class ProjectUserController {
      */
     @PostMapping("/user/modify")
     public RestResponse modify(@RequestBody ProjectUser projectUser) {
-        boolean result = projectUserService.modify(projectUser);
-        if (result) {
-            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
-        }
-        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        return projectUserService.modify(projectUser);
     }
 
     /**

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

@@ -29,4 +29,8 @@ public class ProjectCompanyResponse {
      * 项目台量
      */
     private Integer actualNum;
+    /**
+     * 项目状态
+     */
+    private String projectStatus;
 }

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

@@ -141,4 +141,14 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
         return capitalRepairLiftRelevanceMapper.findCapitalListByCompanyId(request.getPage(), request);
     }
 
+    /**
+     * @param request 项目id
+     * @return RestResponse 项目详情
+     * @description 根据项目id查询项目详情
+     * @date 2020/4/21 9:13 下午
+     */
+    public ProjectDetailResponse capitalDetail(ProjectDetailRequest request) {
+        return capitalRepairLiftRelevanceMapper.findProjectById(request);
+    }
+
 }

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

@@ -1,11 +1,14 @@
 package cn.com.ty.lift.business.project.service;
 
+import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserListRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -73,18 +76,21 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
      * @date 2020/1/11 10:43 上午
      */
     @Transactional(rollbackFor = Exception.class)
-    public boolean modify(ProjectUser projectUser){
+    public RestResponse modify(ProjectUser projectUser){
         QueryWrapper<ProjectUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", projectUser.getUserId());
         queryWrapper.eq("project_id", projectUser.getProjectId());
         queryWrapper.eq("user_role", CommonEnum.DefaultRole.MTWORK.getCode());
         ProjectUser entry = getOne(queryWrapper);
+        if (ObjectUtil.isEmpty(entry))
+            return RestResponse.success(null, MessageUtils.get("msg.user.not.exist"));
         //如果该成员是维保工，升级成维保班长，若该项目组成员还有其他维保班长，则该维保班长设置为维保工
         if ("0".equals(entry.getIsMonitor())) {
             //设置为维保班长
             entry.setIsMonitor("1");
             boolean result = update(entry, queryWrapper);
-            if (!result) return false;
+            if (!result)
+                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
             QueryWrapper<ProjectUser> wrapper = new QueryWrapper<>();
             wrapper.eq("mt_company_id", projectUser.getMtCompanyId());
             wrapper.eq("project_id", projectUser.getProjectId());
@@ -101,14 +107,15 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
                     eq("project_id", user.getProjectId());
                     eq("user_role", CommonEnum.DefaultRole.MTWORK.getCode());
                 }});
-                if (ret) return true;
+                if (ret) return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
                 else TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             }
-            return true;
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
         } else {
             //设置为维保工
             entry.setIsMonitor("0");
-            return update(entry, queryWrapper);
+            update(entry, queryWrapper);
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
         }
     }
 

lift-business-service/src/main/resources/locale/response.properties

@@ -25,4 +25,5 @@ msg.error.person.scope=\u4EBA\u5458\u4E0D\u5728\u7535\u68AF\u9644\u8FD1\uFF0C\u6
 msg.project.operate.success=\u670D\u52A1\u64CD\u4F5C\u6210\u529F
 msg.exist.record=\u8BE5\u4FDD\u517B\u8BB0\u5F55\u5DF2\u5B58\u5728\uFF0C\u4E0D\u80FD\u91CD\u590D\u4FDD\u517B
 msg.sign.success=\u7B7E\u5230\u6210\u529F
-msg.sign.limit=\u4ECA\u65E5\u5DF2\u7B7E\u5230
+msg.sign.limit=\u4ECA\u65E5\u5DF2\u7B7E\u5230
+msg.user.not.exist=\u7B26\u5408\u6761\u4EF6\u7684\u7EF4\u4FDD\u5DE5\u4E0D\u5B58\u5728\uFF0C\u8BF7\u6838\u5B9E\u6570\u636E

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

@@ -43,10 +43,11 @@
     <select id="findCapitalListByCompanyId" parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest"
             resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectCompanyResponse">
         SELECT
-        cr.id            AS projectId,
-        cr.project_code  AS projectCode,
-        cr.project_name  AS projectName,
-        cr.project_usage AS projectUsage
+        cr.id             AS projectId,
+        cr.project_code   AS projectCode,
+        cr.project_name   AS projectName,
+        cr.project_usage  AS projectUsage,
+        cr.project_status AS projectStatus
         FROM capital_repair_lift_relevance crlr
         LEFT JOIN capital_repair cr ON crlr.project_id = cr.id
         WHERE 1=1
@@ -57,4 +58,38 @@
             AND cr.project_name LIKE CONCAT('%',#{request.projectName,jdbcType=VARCHAR},'%')
         </if>
     </select>
+
+    <!--app端 根据项目id查询项目详情 -->
+    <select id="findProjectById" parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest"
+            resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectDetailResponse">
+        SELECT t.*,
+        ui.name         AS clerkName,
+        pcc.name        AS companyContact,
+        pcc.telephone   AS telephone
+        FROM (SELECT cr.project_name  AS projectName,
+                    cr.project_usage AS projectUsage,
+                    cr.project_address AS address,
+                    cr.province      AS province,
+                    cr.city          AS city,
+                    cr.district      AS district,
+                    cr.start_date    AS startDate,
+                    cr.end_date      AS endDate,
+                    pc.name         AS companyName,
+                    ui.name         AS areaDirector,
+                    r.area_name     AS areaName,
+                    r.clerk         AS clerk_id,
+                    r.id            AS regionId,
+                    cr.pp_contact_id AS contact_id
+        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
+                LEFT JOIN property_company pc ON cr.pp_company_id = pc.id
+        WHERE 1=1
+        <if test="request.id!=null and request.id!=''">
+            AND cr.id = #{request.id,jdbcType=BIGINT}
+        </if>
+        ) t
+        LEFT JOIN property_contact pcc ON t.contact_id = pcc.id
+        LEFT JOIN user_info ui ON ui.user_id = t.clerk_id
+    </select>
 </mapper>

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

@@ -49,7 +49,10 @@
                c.project_status  AS projectStatus,
                r.area_name       AS regionName,
                ui.name           AS userName,
-               pc.name           AS companyName
+               pc.name           AS companyName,
+               c.overdue_date    AS overdueDate,
+               c.overdue_reason  AS overdueReason,
+               c.img_url         AS imgUrl
         FROM capital_repair c
         LEFT JOIN region r ON c.region_id = r.id
         LEFT JOIN user_info ui ON r.user_id = ui.user_id

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -155,7 +155,8 @@
 		p.project_code  AS projectCode,
 		p.project_name  AS projectName,
 		p.project_usage AS projectUsage,
-		p.actual_num    AS actualNum
+		p.actual_num    AS actualNum,
+		p.project_status AS projectStatus
 		FROM project_lift_relevance plr
 		LEFT JOIN project p ON plr.project_id = p.id
 		WHERE 1=1