Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java

dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java

@@ -61,16 +61,21 @@ public class CrmsCompanyPersonalController {
     @PostMapping("/insertCompanyPersonal")
     @ApiOperation(value = "新增个人/企业关联人")
     public ResponseResult insertCompanyPersonal(@RequestBody @Valid CrmsCompanyPersonalReq personal) {
-        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
-        Date parse = null;
-        try {
-            parse = sdf.parse(personal.getRegisteredTime());
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
         CrmsCompanyPersonal crmsCompanyPersonal = new CrmsCompanyPersonal();
-        BeanUtils.copyProperties(personal,crmsCompanyPersonal);
-        crmsCompanyPersonal.setRegisteredTime(parse);
+        if(personal.getRegisteredTime() !=null){
+            SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+            Date parse = null;
+            try {
+                parse = sdf.parse(personal.getRegisteredTime());
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            BeanUtils.copyProperties(personal,crmsCompanyPersonal);
+            crmsCompanyPersonal.setRegisteredTime(parse);
+        }else{
+            BeanUtils.copyProperties(personal,crmsCompanyPersonal);
+        }
+
         boolean result = crmsCompanyPersonalService.save(crmsCompanyPersonal);
         CrmsCustomerRelated crmsCustomerRelated = new CrmsCustomerRelated();
         crmsCustomerRelated.setRelatedId(crmsCompanyPersonal.getId().intValue());//关联人Id
@@ -96,16 +101,20 @@ public class CrmsCompanyPersonalController {
     @PostMapping("/updateCompanyPersonal")
     @ApiOperation(value = "编辑个人/企业关联人")
     public ResponseResult updateCompanyPersonal(@RequestBody CrmsCompanyPersonalReq personal){
-        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
-        Date parse = null;
-        try {
-            parse = sdf.parse(personal.getRegisteredTime());
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
         CrmsCompanyPersonal crmsCompanyPersonal = new CrmsCompanyPersonal();
-        BeanUtils.copyProperties(personal,crmsCompanyPersonal);
-        crmsCompanyPersonal.setRegisteredTime(parse);
+        if(personal.getRegisteredTime() !=null){
+            SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+            Date parse = null;
+            try {
+                parse = sdf.parse(personal.getRegisteredTime());
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            BeanUtils.copyProperties(personal,crmsCompanyPersonal);
+            crmsCompanyPersonal.setRegisteredTime(parse);
+        }else{
+            BeanUtils.copyProperties(personal,crmsCompanyPersonal);
+        }
         boolean result = crmsCompanyPersonalService.updateById(crmsCompanyPersonal);
         return result ? ResponseResult.SUCCESS(crmsCompanyPersonal) : ResponseResult.FAIL();
     }

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java

@@ -666,15 +666,18 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         customerEntity.setMotifyTime(new Date());
         customerEntity.setManager(companyCustomerReq.getManager());
         boolean customer = customerDao.updateCustomer(customerEntity);
-        //根据id查询crms_company_customer表里面的customerId
-        CompanyCustomerEntity entity = companyCustomerDao.selectOne(new QueryWrapper<CompanyCustomerEntity>()
-                .eq("customer_id", customerEntity.getId()));
+
         companyCustomerEntity.setCustomerId(customerEntity.getId());
         int company = companyCustomerDao.update(companyCustomerEntity, new QueryWrapper<CompanyCustomerEntity>()
                 .eq("customer_id", companyCustomerEntity.getCustomerId()));
 
+        //根据id查询crms_company_customer表里面的customerId
+        CompanyCustomerEntity entity = companyCustomerDao.selectOne(new QueryWrapper<CompanyCustomerEntity>()
+                .eq("customer_id", customerEntity.getId()));
+        companyCustomerEntity.setCustomerId(entity.getId());
+
         //根据企业id删除关联关系
-        crmsCustomerRelatedMapper.delete(new QueryWrapper<CrmsCustomerRelated>().eq("customer_id", entity.getId()));//companyCustomerEntity.getId()
+        crmsCustomerRelatedMapper.delete(new QueryWrapper<CrmsCustomerRelated>().eq("customer_id",entity.getId()));//companyCustomerEntity.getId()
 
         //绑定关联关系
         List<CrmsCustomerRelated> relatedList = new ArrayList<>();
@@ -683,7 +686,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         for (int i = 0; i < intList.size(); i++) {
             CrmsCustomerRelated crmsCustomerRelated = new CrmsCustomerRelated();
             Integer integer = intList.get(i);
-            crmsCustomerRelated.setCustomerId(entity.getId().intValue());//企业id  companyCustomerEntity.getId().intValue()
+            crmsCustomerRelated.setCustomerId(companyCustomerEntity.getCustomerId().intValue());//企业id  companyCustomerEntity.getId().intValue()
             crmsCustomerRelated.setRelatedId(integer);//关联人/企业id
             relatedList.add(crmsCustomerRelated);
         }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlInsuranceListRes.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.metadata.BaseRowModel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
@@ -72,6 +73,7 @@ public class AlInsuranceListRes extends BaseRowModel implements Serializable {
     /**
      * 申请日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "申请日期")
     private Date applyTime;
 

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

@@ -16,6 +16,7 @@ import com.daqing.framework.domain.guarantee.DgCopyFor;
 import com.daqing.framework.domain.guarantee.DgCopyUser;
 import com.daqing.framework.domain.guarantee.DgProcessUser;
 import com.daqing.framework.model.response.PromptSuccess;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,24 +43,29 @@ public class DgCopyForServiceImpl extends ServiceImpl<DgCopyForMapper, DgCopyFor
 
     @Override
     public boolean copySendUser(Integer businessId, Integer processId, String imgData) throws IOException {
-        //获取随机值
-        String snowflakeId = IdUtil.getSnowflake(6, 4).nextIdStr();
-        //文件扩展名
-        String ext = ".png";
-        //新文件名：雪花算法.文件扩展名
-        String newName = snowflakeId + ext;
-        //指定存放目录
-        String directory = PromptSuccess.UPLOAD_FILE_PATH;
-        // String directory = "D:/img/";
-        //图片完整路径
-        String imgPath = directory + newName;
+        String accessPath = "";
 
-        ImgUtil.generateImage(imgData, imgPath);
-        //拼接图片地址
-        //访问路径前缀
-        String serverPrefix = PromptSuccess.IMAGE_URL_PATH;
-        //访问路径
-        String accessPath = serverPrefix + newName;
+        //图片信息不为空，不生成图片地址
+        if(StringUtils.isNotEmpty(imgData)){
+            //获取随机值
+            String snowflakeId = IdUtil.getSnowflake(6, 4).nextIdStr();
+            //文件扩展名
+            String ext = ".png";
+            //新文件名：雪花算法.文件扩展名
+            String newName = snowflakeId + ext;
+            //指定存放目录
+            String directory = PromptSuccess.UPLOAD_FILE_PATH;
+            // String directory = "D:/img/";
+            //图片完整路径
+            String imgPath = directory + newName;
+
+            ImgUtil.generateImage(imgData, imgPath);
+            //拼接图片地址
+            //访问路径前缀
+            String serverPrefix = PromptSuccess.IMAGE_URL_PATH;
+            //访问路径
+            accessPath = serverPrefix + newName;
+        }
         //取出抄送详情id
         Integer copyForId = 0;
         //添加之前判断是否抄送详情存在，如果存在则更新这条数据