Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonController.java

@@ -7,8 +7,9 @@ import cn.com.ty.lift.business.framework.conf.SystemConfiguration;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.LiftBrand;
 import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
+import cn.com.ty.lift.business.project.dao.entity.model.AreaCodeDTO;
+import cn.com.ty.lift.business.project.dao.mapper.AreaCodeMapper;
 import cn.com.ty.lift.common.constants.RedisConstants;
-import cn.com.ty.lift.common.model.AreaCode;
 import cn.com.ty.lift.common.utils.ValuePool;
 import cn.com.ty.lift.common.verify.Validate;
 import cn.com.ty.lift.common.verify.Validation;
@@ -47,6 +48,7 @@ public class CommonController {
     private EmergencyRepairService        emergencyRepairService;
     private CapitalRepairLiftRelevanceService capitalRepairLiftRelevanceService;
     private MaintenancePlanService maintenancePlanService;
+    private AreaCodeMapper codeMapper;
 
     /**
      * @return RestResponse 省、市、区树形结构列表
@@ -54,12 +56,9 @@ public class CommonController {
      * @date 2019/12/4 10:23 AM
      */
     @PostMapping("area/list")
-    @SuppressWarnings("unchecked")
-    public RestResponse areaList() {
-        List<AreaCode> areaCodeList = (List<AreaCode>) redisTemplate.opsForValue().get(RedisConstants.RK_AREA_LIST);
-        if (ObjectUtil.isEmpty(areaCodeList)) {
-            return RestResponse.success();
-        }
+    @Validation(fields = {"code"})
+    public RestResponse areaList(@Val @RequestBody CommonRequest commonRequest) {
+        List<AreaCodeDTO> areaCodeList = codeMapper.queryAreaList(commonRequest.getCode());
         return RestResponse.success(areaCodeList, MessageUtils.get("msg.query.success"));
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonRequest.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.common;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
 
 /**
  * TODO
@@ -26,4 +27,10 @@ public class CommonRequest {
      * 当前用户角色code
      */
     private String currentRoleCode;
+
+    /**
+     * 省市区编码
+     */
+    @NotEmpty(message = "省市区编码不能为空")
+    private String code;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/controller/PaymentController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
 
 /**
  * @author bieao
@@ -113,7 +112,7 @@ public class PaymentController {
      */
     @PostMapping("history/list")
     @Validation(fields = {"contractId"})
-    public RestResponse historyList(@Valid @RequestBody PaymentRequest request) {
+    public RestResponse historyList(@Val @RequestBody PaymentRequest request) {
         IPage<PaymentHistoryResponse> page = paymentHistoryService.list(request);
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }

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

@@ -40,6 +40,10 @@ public class PaymentListResponse {
      * 实收金额
      */
     private BigDecimal workMoney;
+    /**
+     * 未收金额
+     */
+    private BigDecimal uncollectedMoney;
     /**
      * 应收时间
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/PaymentService.java

@@ -21,10 +21,13 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static java.math.BigDecimal.ZERO;
+
 /**
  * @author bieao
  * @date 2019/12/11
@@ -36,6 +39,9 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
     @Resource
     private PaymentHistoryService paymentHistoryService;
 
+    @Resource
+    private ContractService contractService;
+
     /**
      * @param request 付款列表查询条件
      * @return RestResponse 付款分页列表结果
@@ -211,6 +217,23 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
             entry.setCode("PA" + DateUtils.generateCode());
             entry.setType(request.getContractType());
         });
+        Long contractId = request.getContractId();
+        Contracts contracts = contractService.getOne(contractId);
+        if (Objects.nonNull(contracts)) {
+            //应收金额总计
+            BigDecimal planMoneyTotal = paymentList.stream().map(Payment::getPlanMoney).reduce(ZERO, BigDecimal::add);
+            contracts.setPlanMoneyTotal(planMoneyTotal);
+            //实收金额总计
+            BigDecimal workMoneyTotal = paymentList.stream().map(Payment::getWorkMoney).reduce(ZERO, BigDecimal::add);
+            contracts.setWorkMoneyTotal(workMoneyTotal);
+            //开票金额总计
+            BigDecimal invoiceTotal = paymentList.stream().map(Payment::getAmountInvoice).reduce(ZERO, BigDecimal::add);
+            contracts.setInvoiceMoneyTotal(invoiceTotal);
+            boolean result = contractService.updateById(contracts);
+            if (result) {
+                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+            }
+        }
         return modifyPayment(oldPaymentList, paymentList);
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java

@@ -226,7 +226,8 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("tofill")
-    public RestResponse tofill(@Valid @RequestBody MaintenanceRecord entity) {
+    @Validation(fields = {"mtCompanyId", "mtPlanId", "liftId", "liftType", "type", "workDate", "stopDate", "mtRecordCosts", "sparepart", "partsCost"})
+    public RestResponse tofill(@Val @RequestBody MaintenanceRecord entity) {
         MaintenancePlan plan = maintenancePlanService.getById(entity.getMtPlanId());
         Validate.notNull(plan, ValuePool.MAINTENANCE_PLAN_NOT_EXIST);
         entity.setWorkerId(plan.getWorkerId());

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/PropertyMaintenanceMapper.java

@@ -2,21 +2,20 @@ package cn.com.ty.lift.business.maintenance.dao.mapper;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.model.dto.MaintenancePlanMonthTaskNum;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.PropertyMtResponse;
-import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.constants.SqlConstants;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Select;
 
 import java.time.LocalDate;
 import java.util.List;
 
 public interface PropertyMaintenanceMapper {
-    @Select(ApiConstants.SQL.QUERY_MAINTENANCE_PLAN_EVERYDAY)
+    @Select(SqlConstants.QUERY_MAINTENANCE_PLAN_EVERYDAY)
     IPage<PropertyMtResponse> queryMaintenancePlanEveryDay(IPage<PropertyMtResponse> page, Integer status, LocalDate planDate, Long userId);
 
-    @Select(ApiConstants.SQL.QUERY_MAINTENANCE_PLAN_EVERYDAY_OVERDUE)
+    @Select(SqlConstants.QUERY_MAINTENANCE_PLAN_EVERYDAY_OVERDUE)
     IPage<PropertyMtResponse> queryMaintenancePlanEveryDayOverdue(IPage<PropertyMtResponse> page, LocalDate planDate, Long userId);
 
-    @Select(ApiConstants.SQL.QUERY_MAINTENANCE_PLAN_MONTH_TASK_NUM)
+    @Select(SqlConstants.QUERY_MAINTENANCE_PLAN_MONTH_TASK_NUM)
     List<MaintenancePlanMonthTaskNum> queryMaintenancePlanMonth(Long userId, String yearMonth);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/ScanRecordMapper.java

@@ -3,7 +3,7 @@ package cn.com.ty.lift.business.maintenance.dao.mapper;
 import cn.com.ty.lift.business.maintenance.dao.entity.ScanRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.ScanLiftInfoResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.ScanMaintenanceRecordResponse;
-import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.constants.SqlConstants;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Select;
@@ -20,10 +20,10 @@ import java.util.List;
  */
 public interface ScanRecordMapper extends BaseMapper<ScanRecord> {
 
-    @Select(ApiConstants.SQL.QUERY_LIFT_INFO_BY_LIFT_ID)
+    @Select(SqlConstants.QUERY_LIFT_INFO_BY_LIFT_ID)
     List<ScanLiftInfoResponse> queryLiftInfoByLiftId(Long liftId);
 
-    @Select(ApiConstants.SQL.QUERY_MAINTENANCE_RECORD_BY_LIFT_ID)
+    @Select(SqlConstants.QUERY_MAINTENANCE_RECORD_BY_LIFT_ID)
     IPage<ScanMaintenanceRecordResponse> queryMaintenanceRecordByLiftId(IPage<ScanMaintenanceRecordResponse> page, Long liftId);
 
 }

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

@@ -0,0 +1,22 @@
+package cn.com.ty.lift.business.project.dao.entity.model;
+
+import lombok.Data;
+
+/**
+ * @author bieao
+ * @date 2020/5/19
+ * @description 省市区返回实体
+ */
+@Data
+public class AreaCodeDTO {
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/AreaCodeMapper.java

@@ -1,7 +1,11 @@
 package cn.com.ty.lift.business.project.dao.mapper;
 
 import cn.com.ty.lift.business.project.dao.entity.AreaCode;
+import cn.com.ty.lift.business.project.dao.entity.model.AreaCodeDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AreaCodeMapper extends BaseMapper<AreaCode> {
 
+    @Select("SELECT code,name FROM area_code WHERE parent = #{code}")
+    List<AreaCodeDTO> queryAreaList(String code);
 }

lift-business-service/src/main/resources/mapper/contract/PaymentMapper.xml

@@ -41,6 +41,7 @@
 			   p.project_name                  AS projectName,
 			   c.plan_money_total              AS planMoney,
 			   c.work_money_total              AS workMoney,
+		       (c.plan_money_total - c.work_money_total) as uncollectedMoney,
 		       c.end_date                      AS endDate,
 		       ui.name                         AS cashierUser
 		FROM contracts c
@@ -62,6 +63,7 @@
 			cr.project_name                 AS projectName,
 			c.plan_money_total              AS planMoney,
 			c.work_money_total              AS workMoney,
+		   (c.plan_money_total - c.work_money_total) as uncollectedMoney,
 			c.end_date                      AS endDate,
 			ui.name                         AS cashierUser
 		FROM contracts c

lift-common/src/main/java/cn.com.ty.lift.common/constants/ApiConstants.java

@@ -348,84 +348,4 @@ public class ApiConstants {
         Integer OVERDUE = -1;//超期
         Integer LAWS_STIPULATION_OVERDUE = 10;//自定义的法规超期，非数据库状态
     }
-
-    //根据用户id和维保计划时间和状态查询用户那一天的各种类型维保任务(待保养/保养中/已完成/计划超期)
-    public interface SQL {
-        String QUERY_MAINTENANCE_PLAN_EVERYDAY =
-                "select p.project_name projectName," +
-                        "       l.registration_code registrationCode," +
-                        "       l.device_position devicePosition," +
-                        "       l.lift_type liftType," +
-                        "       l.category category," +
-                        "       ui.name workerName," +
-                        "       mp.plan_date planDate" +
-                        "          from maintenance_plan mp" +
-                        "           left join lift l on mp.lift_id = l.id" +
-                        "           left join user_info ui on mp.worker_id = ui.user_id" +
-                        "           left join project p on mp.project_id = p.id" +
-                        "          where mp.plan_date = #{planDate}" +
-                        "       and mp.status = #{status}" +
-                        "   and mp.project_id in (select project_id from project_user where user_id = #{userId})";
-
-        String QUERY_MAINTENANCE_PLAN_EVERYDAY_OVERDUE =
-                "select mp.status           planStatus," +
-                        "       l.id                liftId," +
-                        "       p.project_name      projectName," +
-                        "       l.registration_code registrationCode," +
-                        "       l.device_position   devicePosition," +
-                        "       l.lift_type         liftType," +
-                        "       l.category          category," +
-                        "       ui.name             name" +
-                        "   from maintenance_plan mp" +
-                        "         left join lift l on mp.lift_id = l.id" +
-                        "         left join user_info ui on mp.worker_id = ui.user_id" +
-                        "         left join project p on mp.project_id = p.id" +
-                        "   where plan_date = #{planDate}" +
-                        "  and TimeStampDiff(DAY, DATE_FORMAT(plan_date, '%Y%m%d'), DATE_FORMAT(work_date, '%Y%m%d')) > 15" +
-                        "  and mp.project_id in (select project_id from project_user where user_id = #{userId})";
-
-        //扫码，查询电梯信息
-        String QUERY_LIFT_INFO_BY_LIFT_ID =
-                "<script>" +
-                        "select l.id                id," +
-                        "       l.registration_code registrationCode," +
-                        "       l.device_position   devicePosition," +
-                        "       p.project_name      projectName," +
-                        "       if(l.lift_type = 1, '直梯', '扶梯')         liftType," +
-                        "       ui.name             workerName," +
-                        "       ui.mobile           workerMobile," +
-                        "       p.project_status    projectStatus" +
-                        "   from project_lift_relevance plr" +
-                        "         left join lift l on plr.lift_id = l.id" +
-                        "         left join project p on plr.project_id = p.id" +
-                        "         left join user_info ui on plr.worker_id = ui.user_id" +
-                        "   where l.id = #{liftId}" +
-                        "  and p.project_status = '2'" +
-                        "</script>";
-
-        //扫码，查询维保记录列表
-        String QUERY_MAINTENANCE_RECORD_BY_LIFT_ID =
-                "select mr.id                 recordId," +
-                        "       mr.plan_date          planDate," +
-                        "       mr.work_date          workDate," +
-                        "       ui.name               workerName," +
-                        "       mr.maintenance_advice maintenanceAdvice," +
-                        "       e.advice              consumerAdvice," +
-                        "       mr.status             status," +
-                        "       mr.lift_id            liftId," +
-                        "       mr.lift_type          liftType" +
-                        "   from maintenance_record mr" +
-                        "         left join user_info ui on mr.worker_id = ui.user_id" +
-                        "         left join evaluation e on mr.id = e.record_id and e.source = '1'" +
-                        "   where mr.lift_id = #{liftId}" +
-                        "   order by mr.work_date desc";
-
-        //物管，根据用户id和月份，查询那一月每天的(待保养/保养中/已完成/计划超期/法规超期)的数量
-        String QUERY_MAINTENANCE_PLAN_MONTH_TASK_NUM =
-                "select DATE_FORMAT(plan_date, '%d') day, status status, count(status) count" +
-                        "   from maintenance_plan" +
-                        "   where project_id in (select project_id from project_user where user_id = #{userId})" +
-                        "  and DATE_FORMAT(plan_date, '%Y-%m') = #{yearMonth}" +
-                        "   group by plan_date, status";
-    }
 }

lift-common/src/main/java/cn.com.ty.lift.common/constants/SqlConstants.java

@@ -0,0 +1,83 @@
+package cn.com.ty.lift.common.constants;
+
+public interface SqlConstants {
+    //根据用户id和维保计划时间和状态查询用户那一天的各种类型维保任务(待保养/保养中/已完成/计划超期)
+    String QUERY_MAINTENANCE_PLAN_EVERYDAY =
+            "select         p.project_name projectName," +
+                    "       l.registration_code registrationCode," +
+                    "       l.device_position devicePosition," +
+                    "       l.lift_type liftType," +
+                    "       l.category category," +
+                    "       ui.name workerName," +
+                    "       mp.plan_date planDate" +
+                    "          from maintenance_plan mp" +
+                    "           left join lift l on mp.lift_id = l.id" +
+                    "           left join user_info ui on mp.worker_id = ui.user_id" +
+                    "           left join project p on mp.project_id = p.id" +
+                    "       where mp.plan_date = #{planDate}" +
+                    "             and mp.status = #{status}" +
+                    "             and mp.project_id in (select project_id from project_user where user_id = #{userId})";
+
+    //查询法规超期维保列表。
+    String QUERY_MAINTENANCE_PLAN_EVERYDAY_OVERDUE =
+            "select         mp.status           planStatus," +
+                    "       l.id                liftId," +
+                    "       p.project_name      projectName," +
+                    "       l.registration_code registrationCode," +
+                    "       l.device_position   devicePosition," +
+                    "       l.lift_type         liftType," +
+                    "       l.category          category," +
+                    "       ui.name             name" +
+                    "   from maintenance_plan mp" +
+                    "         left join lift l on mp.lift_id = l.id" +
+                    "         left join user_info ui on mp.worker_id = ui.user_id" +
+                    "         left join project p on mp.project_id = p.id" +
+                    "   where plan_date = #{planDate}" +
+                    "   and work_date is null" +
+                    "   and TimeStampDiff(DAY, DATE_FORMAT(plan_date, '%Y%m%d'), DATE_FORMAT(CURDATE(), '%Y%m%d')) > 15" +
+                    "   and mp.project_id in (select project_id from project_user where user_id = #{userId})";
+
+    //扫码，查询电梯信息
+    String QUERY_LIFT_INFO_BY_LIFT_ID =
+            "<script>" +
+                    "select l.id                id," +
+                    "       l.registration_code registrationCode," +
+                    "       l.device_position   devicePosition," +
+                    "       p.project_name      projectName," +
+                    "       if(l.lift_type = 1, '直梯', '扶梯')         liftType," +
+                    "       ui.name             workerName," +
+                    "       ui.mobile           workerMobile," +
+                    "       p.project_status    projectStatus" +
+                    "   from project_lift_relevance plr" +
+                    "         left join lift l on plr.lift_id = l.id" +
+                    "         left join project p on plr.project_id = p.id" +
+                    "         left join user_info ui on plr.worker_id = ui.user_id" +
+                    "   where l.id = #{liftId}" +
+                    "       and p.project_status = '2'" +
+                    "</script>";
+
+    //扫码，查询维保记录列表
+    String QUERY_MAINTENANCE_RECORD_BY_LIFT_ID =
+            "select         mr.id                 recordId," +
+                    "       mr.plan_date          planDate," +
+                    "       mr.work_date          workDate," +
+                    "       ui.name               workerName," +
+                    "       mr.maintenance_advice maintenanceAdvice," +
+                    "       e.advice              consumerAdvice," +
+                    "       mr.status             status," +
+                    "       mr.lift_id            liftId," +
+                    "       mr.lift_type          liftType" +
+                    "   from maintenance_record mr" +
+                    "         left join user_info ui on mr.worker_id = ui.user_id" +
+                    "         left join evaluation e on mr.id = e.record_id and e.source = '1'" +
+                    "   where mr.lift_id = #{liftId}" +
+                    "       order by mr.work_date desc";
+
+    //物管，根据用户id和月份，查询那一月每天的(待保养/保养中/已完成/计划超期)的数量
+    String QUERY_MAINTENANCE_PLAN_MONTH_TASK_NUM =
+            "select     DATE_FORMAT(plan_date, '%d') day, status status, count(status) count" +
+                    "   from maintenance_plan" +
+                    "   where project_id in (select project_id from project_user where user_id = #{userId})" +
+                    "       and DATE_FORMAT(plan_date, '%Y-%m') = #{yearMonth}" +
+                    "       group by plan_date, status";
+}

lift-push/src/main/java/cn/com/ty/lift/push/message/controller/TimeMessageController.java

@@ -36,7 +36,8 @@ public class TimeMessageController {
                 .eq(messageVo.getUserId() != null, "user_id", messageVo.getUserId())
                 .eq(messageVo.getType() != null, "type", messageVo.getType())
                 .notIn("device_model", ApiConstants.DeviceModel.PC)
-                .orderByAsc("view_flag", "create_time"));
+                .orderByAsc("view_flag")
+                .orderByDesc("create_time"));
         MessageBO messageBO = MessageBO.pageCastMessageBo(result);
         messageBO.setReadCount((long) timeMessageService.count(Wrappers.<TimeMessage>query()
                 .eq(messageVo.getUserId() != null, "user_id", messageVo.getUserId())

lift-system-service/src/main/java/cn/com/ty/lift/system/framework/runner/SystemServiceRunner.java

@@ -43,7 +43,7 @@ public class SystemServiceRunner implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         //初始化省、市、区信息列表
-        initAreaList();
+        //initAreaList();
         //初始化全局设置到redis
         initGlobalSet();
     }