Merge remote-tracking branch 'origin/developer' into developer

gic-platform-auth-api/src/main/java/com/gic/auth/service/AuditorApiService.java

@@ -95,16 +95,4 @@ public interface AuditorApiService {
      */
     ServiceResponse<List<AuditorDTO>> listAuditorByProject(Integer projectItemId, Integer userId, Integer enterpriseId);
 
-    /**
-     * 审核员审核受审项目审批项
-     * @Title: genAuditProject
-     * @Description:
-     * @author zhiwj
-     * @param projectItemId 审批项id
-     * @param userId 管理员id
-     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
-     * @throws
-     */
-    ServiceResponse<Void> genAuditProject(Integer projectItemId, Integer userId, Integer enterpriseId);
-
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AuditorApiServiceImpl.java

@@ -12,7 +12,6 @@ import com.gic.auth.service.*;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.PageHelperUtils;
-import com.gic.enterprise.constants.Constants;
 import com.gic.enterprise.dto.ProjectItemDTO;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.qo.ProjectItemQO;
@@ -251,38 +250,6 @@ public class AuditorApiServiceImpl implements AuditorApiService {
         }
     }
 
-    @Override
-    public ServiceResponse<Void> genAuditProject(Integer projectItemId, Integer userId, Integer enterpriseId) {
-        ServiceResponse<List<AuditorDTO>> auditorServiceResponse = this.listAuditorByProject(projectItemId, userId, enterpriseId);
-        if (!auditorServiceResponse.isSuccess()) {
-            return EnterpriseServiceResponse.failure(auditorServiceResponse.getCode(), auditorServiceResponse.getMessage());
-        }
-        ServiceResponse<ProjectItemDTO> projectItemService = projectItemApiService.getById(projectItemId);
-        if (!projectItemService.isSuccess()) {
-            return EnterpriseServiceResponse.failure(projectItemService.getCode(), projectItemService.getMessage());
-        }
-
-        List<AuditorDTO> auditorList = auditorServiceResponse.getResult();
-        for (AuditorDTO auditorDTO : auditorList) {
-            // todo 发送微信模板消息
-//            sendWxMessage();
-            if (auditorDTO.getUserId() != null) {
-                TabSysUser user = userService.getUserById(auditorDTO.getUserId());
-                if (user != null) {
-                    // todo 如果审核员是管理员 插入后台待办事项
-//                    saveToDoList();
-                }
-            }
-        }
-        ProjectItemDTO projectItemDTO = projectItemService.getResult();
-        if (Constants.NORMAL_STATUS.equals(projectItemDTO.getIsPlatform())) {
-            // todo 如果是平台审批项， 还要发送给实施
-            // sendWxMessage();
-        }
-
-        return ServiceResponse.success();
-    }
-
     private String getTempQrCodeUrl(Integer auditorId) {
         logger.info("生成临时带参二维码 auditorId:{}", auditorId);
         ServiceResponse<String> serviceResponse = weixinBaseFunService.getTemporaryQRcodeURL(APPKEY, "auditor_" + auditorId, 300);