合同bug修改

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

@@ -26,6 +26,11 @@ public class ContractsExtend {
      */
     private String contractId;
 
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
     /**
      * 项目名称
      */

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

@@ -95,19 +95,14 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
     @Transactional(rollbackFor = Exception.class)
     public RestResponse add(ContractsExtend extend) {
         Contracts contracts = extend.getContracts();
-        if (ObjectUtil.isEmpty(extend.getContractId())) {
-            Project project = new Project();
-            project.setId(IdWorker.getId());
-            contracts.setProjectId(project.getId());
+        Project project = new Project();
+        contracts.setProjectId(project.getId());
+        if (ObjectUtil.isEmpty(extend.getProjectId())) {
             //插入项目信息
             Project info = saveProject(contracts, extend, project);
             if (ObjectUtil.isEmpty(info)) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return RestResponse.fail(MessageUtils.get("msg.add.fail"));
             }
-        } else {
-            //续签合同
-            contracts.setPreviousId(extend.getContractId());
         }
         if (ObjectUtil.isEmpty(contracts.getCode())) {
             //按当前日期时间戳自动生成合同编号

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -66,24 +66,25 @@
     <!-- 根据区域，项目，电梯号，电梯品牌，电梯类型，维保工查询电梯列表信息-->
     <select id="findByCondition" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse"
             parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest">
-        SELECT
-        l.id AS id,
-        l.lift_code AS liftCode,
-        l.registration_code AS registrationCode,
-        l.lift_type AS liftType,
-        l.device_position AS devicePosition,
-        lb.name AS liftBrand,
+        SELECT l.id              AS id,
+        pclr.id                  AS companyRelevanceId,
+        plr.id                   AS projectRelevanceId,
+        l.lift_code              AS liftCode,
+        l.registration_code      AS registrationCode,
+        l.lift_type              AS liftType,
+        l.device_position        AS devicePosition,
+        lb.name                  AS liftBrand,
         pclr.lift_company_status AS liftStatus,
-        plr.first_time AS firstMaintenanceTime,
-        p.project_name AS projectName,
-        p.id AS projectId,
-        plr.lift_locked AS liftLocked
+        plr.first_time           AS firstMaintenanceTime,
+        p.project_name           AS projectName,
+        p.id                     AS projectId,
+        plr.lift_locked          AS liftLocked
         FROM platform_company_lift_relevance pclr
         LEFT JOIN lift l ON pclr.lift_id = l.id
-        LEFT JOIN project_lift_relevance plr ON pclr.mt_company_id = plr.mt_company_id and pclr.lift_id = plr.lift_id
-        LEFT JOIN project p ON pclr.mt_company_id = p.mt_company_id and plr.project_id = p.id
+        LEFT JOIN project_lift_relevance plr ON pclr.mt_company_id = plr.mt_company_id AND pclr.lift_id = plr.lift_id
+        LEFT JOIN project p ON pclr.mt_company_id = p.mt_company_id AND plr.project_id = p.id
         LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
-        WHERE 1=1
+        WHERE 1 = 1;
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
             AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
         </if>