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

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AuditRiskModeDTO.java

@@ -12,6 +12,7 @@ public class AuditRiskModeDTO extends AuditLogDTO {
     private Integer duration;
     private Integer auditDuration;
     private String applyReason;
+    private String applyReasonName;
 
     public Integer getDuration() {
         return duration;
@@ -36,4 +37,12 @@ public class AuditRiskModeDTO extends AuditLogDTO {
     public void setApplyReason(String applyReason) {
         this.applyReason = applyReason;
     }
+
+    public void setApplyDurationName(String applyReasonName) {
+        this.applyReasonName = applyReasonName;
+    }
+
+    public String getApplyReasonName() {
+        return applyReasonName;
+    }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AuditLogApiServiceImpl.java

@@ -17,10 +17,7 @@ import com.gic.enterprise.config.Config;
 import com.gic.enterprise.constant.AuditTypeEnum;
 import com.gic.enterprise.constant.DataSecurityAuditEnum;
 import com.gic.enterprise.constants.Constants;
-import com.gic.enterprise.dto.AuditDownloadDTO;
-import com.gic.enterprise.dto.AuditLogDTO;
-import com.gic.enterprise.dto.AuditRiskModeDTO;
-import com.gic.enterprise.dto.TodoItemDTO;
+import com.gic.enterprise.dto.*;
 import com.gic.enterprise.entity.*;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.qo.AuditLogQO;
@@ -77,6 +74,8 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
     @Autowired
     private WxTemplateRouterApiService wxTemplateRouterApiService;
     @Autowired
+    private DictApiService dictApiService;
+    @Autowired
     private Config config;
 
     @Override
@@ -279,6 +278,10 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
                 TabRiskMode riskMode = riskModeService.getById(jsonObject.getInteger("riskModeId"));
                 auditRiskModeDTO.setDuration(riskMode.getDurationCode());
                 auditRiskModeDTO.setApplyReason(riskMode.getApplyReason());
+                DictDTO dict = dictApiService.getDict(com.gic.enterprise.constant.Constants.RISK_MODE_DURATION_CATEGORY, riskMode.getDurationCode().toString()).getResult();
+                if (dict != null) {
+                    auditRiskModeDTO.setApplyDurationName(dict.getKey());
+                }
                 auditLogDTO = auditRiskModeDTO;
 //                return EnterpriseServiceResponse.success(auditRiskModeDTO);
             } else if (AuditTypeEnum.DOWNLOAD_REPORT.getCode().equals(audit.getAuditType())) {

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/AuditLogController.java

@@ -97,4 +97,17 @@ public class AuditLogController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    @RequestMapping("/ensure-audit")
+    public RestResponse ensureAudit(String projectItemCode) {
+        // 是否需要审批  需要审批true   不需要审批false
+        if (UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() == 1) {
+            return RestResponse.success(false);
+        }
+        ServiceResponse<ProjectItemDTO> serviceResponse = this.projectItemApiService.getByProjectItemCode(projectItemCode);
+        if (!serviceResponse.isSuccess()) {
+            return ResultControllerUtils.commonResult(serviceResponse);
+        }
+        return RestResponse.success(serviceResponse.getResult().getUseStatus() == 1);
+    }
+
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/EnterpriseController.java

@@ -6,6 +6,7 @@ import com.gic.auth.dto.UserDTO;
 import com.gic.auth.service.UserApiService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.download.utils.log.LogUtils;
 import com.gic.enterprise.dto.BillingAccountDTO;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.response.EnterpriseRestResponse;
@@ -81,6 +82,7 @@ public class EnterpriseController {
         enterpriseDTO.setAddress(address);
         enterpriseDTO.setLogo(logo);
         ServiceResponse<Integer> serviceResponse = enterpriseApiService.editEnterprise(enterpriseDTO);
+        LogUtils.createLog("修改商户信息", "基本信息");
         return ResultControllerUtils.commonResult(serviceResponse);
     }