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

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

@@ -61,6 +61,10 @@ public class LiftResponse {
      * 维保工
      */
     private String workerName;
+    /**
+     * 维保工id
+     */
+    private String workerId;
     /**
      * 首保时间
      */

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

@@ -185,7 +185,7 @@ public class ProjectController {
      * @description 服务操作
      * @date 2019/12/10 5:42 PM
      */
-    @PostMapping("serviceOperate")
+    @PostMapping("service/operate")
     public RestResponse serviceOperate(@RequestBody SelectBatchPlatformCompanyRequest request) {
         return platformCompanyLiftRelevanceService.serviceOperate(request);
     }

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

@@ -145,16 +145,19 @@
 		lb.name                   AS liftBrand,
 		l.annual_inspection_date  AS annualInspectionDate,
 		pclr.lift_company_status  AS liftStatus,
-		ui.name                   AS workerName
-		FROM project_lift_relevance plr
-		LEFT JOIN lift l ON plr.lift_id = l.id
+		pclr.id                   AS companyRelevanceId,
+		ui.name                   AS workerName,
+		plr.worker_id             AS workerId
+		FROM platform_company_lift_relevance pclr
+		LEFT JOIN lift l ON pclr.lift_id = l.id
 		LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
+		LEFT JOIN project_lift_relevance plr ON pclr.lift_id = plr.lift_id
+		AND pclr.id = plr.relevance_id
 		LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
-		LEFT JOIN platform_company_lift_relevance pclr ON plr.lift_id = pclr.lift_id AND pclr.id = plr.relevance_id
 		WHERE pclr.lift_company_status != '1'
-        AND plr.delete_flag = '0'
+		AND plr.delete_flag = '0'
 		<if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
-			AND plr.mt_company_id != #{request.mtCompanyId,jdbcType=BIGINT}
+			AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		</if>
 	</select>
 

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/CompanyAttestationController.java

@@ -68,7 +68,7 @@ public class CompanyAttestationController {
     /**
      * @param companyAttestationRequest id:认证信息id，mtCompanyId:企业id
      * @return
-     * @description 认证失败
+     * @description 认证不通过
      * @date 2019-12-12 15:25
      */
     @PostMapping("/auditFail")

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/RoleService.java

@@ -78,12 +78,9 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
         Role role = new Role(roleRequest);
         role.setCreateTime(new Date());
         //保存角色信息
-        int insertCount = roleMapper.insert(role);
+        roleMapper.insert(role);
         //保存角色菜单关联关系
-        boolean saveBatchFlag = roleMenuService.saveRoleMenu(role.getId(), roleRequest.getMenuIds());
-        if (insertCount == 0 || !saveBatchFlag) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存角色信息失败");
-        }
+        roleMenuService.saveRoleMenu(role.getId(), roleRequest.getMenuIds()); 
         return RestResponse.success(role, ApiConstants.RESULT_SUCCESS, "保存角色信息成功");
     }