Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java

@@ -27,10 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -50,6 +47,24 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
         AlRepaymentEntry alRepaymentEntry = new AlRepaymentEntry();
         BeanUtils.copyProperties(alRepaymentEntryReq,alRepaymentEntry);
 
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date one = null;
+        Date two = null;
+
+        try {
+            if(alRepaymentEntry.getRepaymentDate() != null){
+                one = formatter2.parse(formatter.format(alRepaymentEntry.getRepaymentDate())+" 00:00:00");
+            }
+            if(alRepaymentEntry.getActualRepaymentDate() != null){
+                two = formatter2.parse(formatter.format(alRepaymentEntry.getActualRepaymentDate())+" 00:00:00");
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        alRepaymentEntry.setRepaymentDate(one);
+        alRepaymentEntry.setActualRepaymentDate(two);
+
         Map map = DgApplyAmountInfoController.getUserIdAndName();
         String name = map.get("name").toString();
         Integer userId = Integer.parseInt(map.get("userId").toString());
@@ -164,7 +179,19 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
 
         List<AlRepaymentEntryRes>list = this.baseMapper.selectBind();
         Date date = new Date();
-        long times1 = date.getTime();//当前时间
+        //long times1 = date.getTime();//当前时间
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date four = null;
+        Date now = new Date();
+
+        try {
+            four = formatter2.parse(formatter.format(now)+" 00:00:00");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        long times1 = four.getTime();//当前时间
 
         //遍历list取出应还款日，计算逾期天数=当前时间-应还款日
         for (AlRepaymentEntryRes res:list) {
@@ -179,7 +206,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
             AlInsuranceList alInsuranceList = new AlInsuranceList();
             alInsuranceList.setId(res.getInsuranceId());
             //如果存在当前日期超过应还款日时的数据，则计算逾期天数,并且状态改为已逾期，同时要处理保后管理模块内容
-            if(times1 > times2){
+            if(res.getActualRepaymentDate()==null && times1 > times2){
                 int days = (int)((times1-times2)/1000/60/60/24);
                 entry.setOverdueDays(days);
                 entry.setRepaymentStatus(3);//已逾期
@@ -189,16 +216,16 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
                 alInsuranceList.setPaymentStatus(2);//已逾期
                 alInsuranceList.setIsOverdue(0);//是否逾期过：0->是；1->否；
                 alInsuranceListMapper.updateById(alInsuranceList);
-            }else if(times1==times2){//应还款日=当前日期，则显示状态为待还款
+            }else if(res.getActualRepaymentDate()==null && times1==times2){//应还款日=当前日期，则显示状态为待还款
                 entry.setRepaymentStatus(1);//待还款
                 this.baseMapper.updateById(entry);//更新状态
-            }else if(times3 <= times1){//实际还款日不超过当前日期时，状态为已还款
+            }else if(res.getActualRepaymentDate()!=null && times3 <= times1){//实际还款日不超过当前日期时，状态为已还款
                 entry.setRepaymentStatus(2);//已还款
                 this.baseMapper.updateById(entry);//更新状态
-            }else if(times1 <= times2){//当前日期未到应还款日,状态为未到期
+            }else if(res.getActualRepaymentDate()==null && times1 <= times2){//当前日期未到应还款日,状态为未到期
                 entry.setRepaymentStatus(4);//未到期
                 this.baseMapper.updateById(entry);//更新状态
-                if(res.getRemainAmount().doubleValue()>0){//如果存在剩余额度,保后管理列表状态为还款中
+                if(res.getRemainAmount()!=null && res.getActualRepaymentDate()==null && res.getRemainAmount().doubleValue()>0){//如果存在剩余额度,保后管理列表状态为还款中
                     alInsuranceList.setPaymentStatus(1);//还款中
                     alInsuranceListMapper.updateById(alInsuranceList);
                 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -62,8 +62,6 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
     @Resource
     private DgEnclosureInfoMapper dgEnclosureInfoMapper;
-    @Resource
-    private RedisTemplate<String,String> redisTemplate;
 
     @Resource
     private CrmsFeignService crmsFeignService;
@@ -136,20 +134,16 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             e.printStackTrace();
         }
 
+        DgApplyAmountList dgApplyAmountList = new DgApplyAmountList();
+        if(businessApplication.getIsSaveOrCommit()==1){//提交
             //根据社会统一信用代码判断是否可以申请业务，同一客户如果有一笔业务在业务流程在进行中，则不能再申请
-        //首先根据统一社会信用代码查询备份企业业务关联表中的业务id
+            this.repeatBusiness(businessApplication);
-        List<DgBusinessCompany> businessCompanyList = dgBusinessCompanyMapper.selectList(new QueryWrapper<DgBusinessCompany>()
+
-                .eq("social_unified_code", businessApplication.getSocialUnifiedCode()));
+            dgApplyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审批状态 设置为审核中
-        List<Integer> businessIds = new ArrayList<Integer>();
+            dgApplyAmountList.setOperatingStatus(StatusCode.CZ_LAUNCH);//操作状态设置为已发起
-        for (DgBusinessCompany businessCompany:businessCompanyList) {
+        }else{//保存
-            businessIds.add(businessCompany.getBusinessId());
+            dgApplyAmountList.setStatus(StatusCode.SP_DRAFT);//审批状态 保存为草稿
-        }
+            dgApplyAmountList.setOperatingStatus(StatusCode.CZ_TO_BE_SUBMITTED);//操作状态设置为待提交
-        //根据业务id查询dg_business_process_status表中是否存在业务为进行中的记录
-        Integer businessStatus=StatusCode.YW_IN_PROGRESS;//进行中
-        int count2 = dgBusinessProcessStatusMapper.selectBybusinessIdAndStatus(businessIds,businessStatus);
-        //如果存在，则不能再申请业务
-        if(count2>0){
-            ExceptionCast.cast(GuaranteeCode.REPEAT_BUSINESS);
         }
 
         //申请贷款相关信息
@@ -194,41 +188,18 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         int insert = dgApplyAmountInfoMapper.insert(dgApplyAmountInfo);
 
         //新增到业务列表
-        DgApplyAmountList dgApplyAmountList = new DgApplyAmountList();
         dgApplyAmountList.setBusinessId(dgApplyAmountInfo.getId());
         dgApplyAmountList.setPresenterId(Integer.parseInt(userId));
         dgApplyAmountList.setEmpId(Integer.parseInt(userId));
         dgApplyAmountList.setRoleId(PromptSuccess.DB_YWY_ID);
         dgApplyAmountList.setType(1);//类型为担保业务员
 
-        if(businessApplication.getIsSaveOrCommit()==1){//提交
-            dgApplyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审批状态 设置为审核中
-            dgApplyAmountList.setOperatingStatus(StatusCode.CZ_LAUNCH);//操作状态设置为已发起
-        }else{//保存
-            dgApplyAmountList.setStatus(StatusCode.SP_DRAFT);//审批状态 保存为草稿
-            dgApplyAmountList.setOperatingStatus(StatusCode.CZ_TO_BE_SUBMITTED);//操作状态设置为待提交
-        }
         dgApplyAmountListMapper.insert(dgApplyAmountList);
 
 
         //修改是否存在关联人
         crmsFeignService.updateIsExistRelated(dgApplyAmountInfo.getCompanyId(),businessApplication.getIsExistRelated());
 
-        //绑定关联关系
-/*        List<CrmsCustomerRelated> relatedList = new ArrayList<>();
-        List<Integer> intList = businessApplication.getRelatedId();
-
-        for(int i=0;i<intList.size();i++){
-            CrmsCustomerRelated crmsCustomerRelated = new CrmsCustomerRelated();
-            Integer integer = intList.get(i);
-            crmsCustomerRelated.setCustomerId(dgApplyAmountInfo.getCompanyId());//企业id
-            crmsCustomerRelated.setRelatedId(integer);//关联人/企业id
-            relatedList.add(crmsCustomerRelated);
-        }*/
-
-        //此处在新增关联企业/个人的时候就做了绑定，不需要重复绑定
-        //crmsFeignService.insertCustomerRelated(relatedList);
-
         //上传附件信息
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(dgApplyAmountInfo.getId());//业务id
@@ -325,13 +296,6 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         }
         dgApplyAmountInfo.setRemark(dgApplyAmountList.getApplyContent());
 
-/*        DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
-        applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
-        //根据企业id查询企业详情
-        ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
-
-        LinkedHashMap linkedList = (LinkedHashMap)result.getData();*/
-
         //根据业务id查询备份企业信息
         DgBusinessCompany dgBusinessCompany = dgBusinessCompanyMapper.selectOne(new QueryWrapper<DgBusinessCompany>()
                 .eq("business_id", dgApplyAmountList.getBusinessId()));
@@ -392,6 +356,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
     @Override
     public int updateBusinessApplication(BusinessApplicationRequest businessApplication) {
+        //根据社会统一信用代码判断是否可以申请业务，同一客户如果有一笔业务在业务流程在进行中，则不能再申请
+        this.repeatBusiness(businessApplication);
         //申请贷款相关信息
         DgApplyAmountInfo dgApplyAmountInfo = new DgApplyAmountInfo();
         dgApplyAmountInfo.setId(businessApplication.getBusinessId());
@@ -724,4 +690,24 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         return userId;
     }
 
+    public void repeatBusiness(BusinessApplicationRequest businessApplication){
+        //根据社会统一信用代码判断是否可以申请业务，同一客户如果有一笔业务在业务流程在进行中，则不能再申请
+        //首先根据统一社会信用代码查询备份企业业务关联表中的业务id
+        List<DgBusinessCompany> businessCompanyList = dgBusinessCompanyMapper.selectList(new QueryWrapper<DgBusinessCompany>()
+                .eq("social_unified_code", businessApplication.getSocialUnifiedCode()));
+        List<Integer> businessIds = new ArrayList<Integer>();
+        for (DgBusinessCompany businessCompany:businessCompanyList) {
+            businessIds.add(businessCompany.getBusinessId());
+        }
+        //根据业务id查询dg_business_process_status表中是否存在业务为进行中的记录
+        Integer businessStatus=StatusCode.YW_IN_PROGRESS;//进行中
+        if(businessIds.size()>0){
+            int count2 = dgBusinessProcessStatusMapper.selectBybusinessIdAndStatus(businessIds,businessStatus);
+            //如果存在，则不能再申请业务
+            if(count2>0){
+                ExceptionCast.cast(GuaranteeCode.REPEAT_BUSINESS);
+            }
+        }
+    }
+
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -438,7 +438,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                 //数据存在，进行更新
                 if (ObjectUtil.isNotNull(paymentConfirmationConsiderFg)){
                     paymentConfirmationConsiderFg.setStatus(StatusCode.SP_IN_REVIEW);
-                    paymentConfirmationConsiderFg.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                    paymentConfirmationConsiderFg.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     //清空上次的审批意见及银行回单
                     paymentConfirmationConsiderFg.setAuditOpinion("");
                     paymentConfirmationConsiderFg.setImgFile("");

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -202,7 +202,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     auditOpinion,9,PromptSuccess.CWB_ID,"","","",status);
             //更新成功，更新资产部经理数据及其他人的数据
             if (update > 0){
-                //更新法规部经理数据
+                //更新担保函法规部经理数据
                 //根据业务id查询法规部经理数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperFg = new QueryWrapper<>();
                 guaranteeLetterAssignUserQueryWrapperFg.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
@@ -210,7 +210,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                 dgGuaranteeLetterAssignUserFg.setStatus(StatusCode.SP_REJECT);
                 guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserFg);
 
-                //更新a角
+                //更新担保函a角数据
                 //根据业务id查询A用户数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperA = new QueryWrapper<>();
                 guaranteeLetterAssignUserQueryWrapperA.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
@@ -218,7 +218,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                 dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT);
                 guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserA);
 
-                //更新b角
+                //更新担保函b角数据
                 //根据业务id查询B用户数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperB = new QueryWrapper<>();
                 guaranteeLetterAssignUserQueryWrapperB.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID);
@@ -226,12 +226,29 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                 dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_REJECT);
                 guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserB);
 
+                //更新担保函资产部经理数据
+                //根据业务id查询资产部经理数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapper = new QueryWrapper<>();
                 guaranteeLetterAssignUserQueryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.ZC_JL_ID);
                 DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapper);
                 dgGuaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT);
                 dgGuaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);
                 dgGuaranteeLetterAssignUser.setAuditOpinion("");
+
+                //如果财务确认的法规部经理有数据，更新法规部经理数据
+                //法规部数据存在，更新法规部经理财务回款数据
+                QueryWrapper<DgPaymentConfirmationConsider> paymentConfirmationConsiderFG = new QueryWrapper<>();
+                paymentConfirmationConsiderFG.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
+                DgPaymentConfirmationConsider paymentConfirmationConsiderFg = baseMapper.selectOne(paymentConfirmationConsiderFG);
+                //数据存在，进行更新
+                if (ObjectUtil.isNotNull(paymentConfirmationConsiderFg)){
+                    paymentConfirmationConsiderFg.setStatus(StatusCode.SP_REJECT);
+                    //清空上次的审批意见及银行回单
+                    paymentConfirmationConsiderFg.setAuditOpinion("");
+                    paymentConfirmationConsiderFg.setImgFile("");
+                    baseMapper.updateById(paymentConfirmationConsiderFg);
+                }
+
                 int updateById = guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUser);
                 //更新成功，返回操作结果
                 log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml

@@ -12,11 +12,12 @@
     <select id="selectBybusinessIdAndStatus" resultType="int" parameterType="long">
         SELECT count(0)
         FROM dg_business_process_status
-        WHERE business_id IN
+        WHERE business_status=#{businessStatus}
+        AND business_id IN
         <foreach collection="businessIds" open="(" separator="," close=")" item="item">
             #{item}
         </foreach>
-        AND business_status=#{businessStatus}
+
     </select>
 
 </mapper>

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java

@@ -11,6 +11,7 @@ import com.daqing.framework.enums.OperationUnit;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.utils.PageUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,6 +32,7 @@ public class SystemLogController implements SystemLogControllerApi {
     private LoginLogService loginLogService;
 
     @GetMapping("/list")
+    @ApiOperation(value = "系统日志列表")
     @Log(detail = "系统日志列表",level = 3,operationUnit = OperationUnit.SYSLOG,operationType = OperationType.SELECT)
     public ResponseResult list(@RequestParam("page") Integer page,
                                @RequestParam("size") Integer size,UserLoginLogRequest userLoginLogRequest) {

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java

@@ -141,8 +141,8 @@ public class UserLoginController implements UserLoginControllerApi {
                 //account = new String(username.getBytes("GBK"),"iso-8859-1");
                 log.info("account==========="+account+"headerImg============="+headerImg);
                 //response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
-                response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
+//                response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
-//                response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
+                response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
             }
         }else {
             userService.weChatBinding(code,response,state);

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java

@@ -92,8 +92,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if(dbUser == null){//openId不存在，返回绑定手机号页面,须另写绑定手机号接口
             log.info("dbUser为空，openId不存在，请先绑定手机号哦~~~");
             try {
-//                response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId);
+                response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId);
-                response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
+//                response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
                 //response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
             } catch (IOException e) {
                 e.printStackTrace();
@@ -159,9 +159,9 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if (countWeChatId > 0){
                 try {
                     log.info("微信重复了,我走到了这里.............................");
-                    response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token+"&message=1");
+//                    response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token+"&message=1");
                     //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1");
-//                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1");
+                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1");
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -171,9 +171,9 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
             if (result){
                 try {
                     log.info("转发成功---------------------------------------");
-                    response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token);
+//                    response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token);
                     //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token);
-//                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token);
+                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token);
                 }catch (IOException e){
                     e.printStackTrace();
                 }

dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java

@@ -32,17 +32,17 @@ public class PromptSuccess {
 
     public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径
 
-    public static final String IMAGE_URL_PATH = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径
+//    public static final String IMAGE_URL_PATH = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径
     //public static final String IMAGE_URL_PATH = "http://8.129.127.185/headImg/"; // 数据库/预加载图片路径
-//    public static final String IMAGE_URL_PATH = "https://www.feifanhitech.com/headImg/"; // 数据库/预加载图片路径
+    public static final String IMAGE_URL_PATH = "https://www.feifanhitech.com/headImg/"; // 数据库/预加载图片路径
 
     public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加
 
     public static final String STATUS_REFUSE = "拒绝";
 
-    public static final String ENCLOSUREFILE_URL_PATH = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径
+//    public static final String ENCLOSUREFILE_URL_PATH = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径
     //public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185/enclosureFile/"; // 附件文件存放路径
-//    public static final String ENCLOSUREFILE_URL_PATH = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径
+    public static final String ENCLOSUREFILE_URL_PATH = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径
 
     public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径
 

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java

@@ -34,7 +34,7 @@ public enum GuaranteeCode implements ResultCode {
     FROM_DESIGN_PROCESS_ERROR(false,140001,"当前节点数据不存在!"),
     FROM_DESIGN_NAME_NOT_NULL(false,140002,"字段名称不能为空!"),
 
-    REPEAT_BUSINESS(false,140002,"企业已申请进行中的业务，不能再次申请！");
+    REPEAT_BUSINESS(false,150001,"企业存在进行中的业务，不能再次申请！");
     /**
      * 操作是否成功
      */