抄送新增参数，新增测试环境配置

dq-financial-crms/src/main/resources/bootstrap.properties

@@ -14,10 +14,10 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 #本地测试环境
-spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
-#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
+spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
 
 #线上生产环境
 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java

@@ -39,9 +39,10 @@ public class DgCopyForController {
     public R copySend(@RequestBody CopySendRequest copySendRequest){
         Integer businessId = copySendRequest.getBusinessId();
         Integer processId = copySendRequest.getProcessId();
-        String imgData = copySendRequest.getImgData();
+        //String imgData = copySendRequest.getImgData();
+        Integer detailId = copySendRequest.getDetailId();
         try {
-            boolean ok = copyForService.copySendUser(businessId,processId,imgData);
+            boolean ok = copyForService.copySendUser(businessId,processId,detailId);
             return ok ? R.ok() : R.error();
         } catch (IOException e) {
             e.printStackTrace();

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/CopySendRequest.java

@@ -18,5 +18,10 @@ public class CopySendRequest {
     @NotNull
     private Integer processId;
 
-    private String imgData;
+    //private String imgData;
+    /**
+     * 详情id
+     */
+    @NotNull
+    private Integer detailId;
 }

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

@@ -58,4 +58,12 @@ public class CopyForMeResponse {
     @ApiModelProperty("截图路径")
     private String picUrl;
 
+    @ExcelIgnore
+    @ApiModelProperty("详情id")
+    private Integer detailId;
+
+    @ExcelIgnore
+    @ApiModelProperty("业务id")
+    private Integer businessId;
+
 }

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

@@ -16,5 +16,5 @@ import java.io.IOException;
  */
 public interface IDgCopyForService extends IService<DgCopyFor> {
 
-    boolean copySendUser(Integer businessId, Integer processId, String imgData) throws IOException;
+    boolean copySendUser(Integer businessId, Integer processId, Integer detailId) throws IOException;
 }

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

@@ -42,8 +42,8 @@ public class DgCopyForServiceImpl extends ServiceImpl<DgCopyForMapper, DgCopyFor
     private DgCopyUserMapper copyUserMapper;
 
     @Override
-    public boolean copySendUser(Integer businessId, Integer processId, String imgData) throws IOException {
-        String accessPath = "";
+    public boolean copySendUser(Integer businessId, Integer processId, Integer detailId) throws IOException {
+/*        String accessPath = "";
 
         //图片信息不为空，不生成图片地址
         if(StringUtils.isNotEmpty(imgData)){
@@ -65,7 +65,7 @@ public class DgCopyForServiceImpl extends ServiceImpl<DgCopyForMapper, DgCopyFor
             String serverPrefix = PromptSuccess.IMAGE_URL_PATH;
             //访问路径
             accessPath = serverPrefix + newName;
-        }
+        }*/
         //取出抄送详情id
         Integer copyForId = 0;
         //添加之前判断是否抄送详情存在，如果存在则更新这条数据
@@ -75,7 +75,8 @@ public class DgCopyForServiceImpl extends ServiceImpl<DgCopyForMapper, DgCopyFor
         if (ObjectUtil.isNotNull(copyFor)){
             //更新数据
             DgCopyFor copyForUpdate = new DgCopyFor();
-            copyForUpdate.setPicUrl(accessPath);
+            //copyForUpdate.setPicUrl(accessPath);
+            copyForUpdate.setDetailId(detailId);
             UpdateWrapper<DgCopyFor> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("business_id",businessId).eq("process_id",processId);
             baseMapper.update(copyForUpdate, updateWrapper);
@@ -84,7 +85,8 @@ public class DgCopyForServiceImpl extends ServiceImpl<DgCopyForMapper, DgCopyFor
             DgCopyFor copyForAdd = new DgCopyFor();
             copyForAdd.setBusinessId(businessId);
             copyForAdd.setProcessId(processId);
-            copyForAdd.setPicUrl(accessPath);
+            //copyForAdd.setPicUrl(accessPath);
+            copyForAdd.setDetailId(detailId);
             //添加抄送详情
             baseMapper.insert(copyForAdd);
             copyForId = copyForAdd.getId();

dq-financial-guarantee/src/main/resources/bootstrap.properties

@@ -15,10 +15,10 @@ spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
 #本地测试环境
-spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
-#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
+spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
 
 #线上生产环境
 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406

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

@@ -18,6 +18,8 @@
         <result column="business_status" property="businessStatus" />
         <result column="approve_date" property="approveDate" />
         <result column="pic_url" property="picUrl" />
+        <result column="detail_id" property="detailId" />
+        <result column="business_id" property="businessId" />
     </resultMap>
 
     <select id="selectCopyForMe" parameterType="com.daqing.financial.guarantee.model.request.CopyForMeRequest"
@@ -31,7 +33,9 @@
             aai.status,
             bps.business_status,
             cf.update_time as approve_date,
-            cf.pic_url
+            cf.pic_url,
+            cf.detail_id,
+            cf.business_id
         FROM
             dg_copy_user cu
             JOIN dg_copy_for cf ON cu.copy_id = cf.id

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

@@ -141,8 +141,9 @@ 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://test.feifanhitech.com/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.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

@@ -94,9 +94,10 @@ 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("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
+                response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -163,7 +164,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
                     log.info("微信重复了,我走到了这里.............................");
 //                    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://test.feifanhitech.com/dq/index.html#/workbench-manpower?token="+token+"&message=1");
+//                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1");
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -175,7 +177,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
                     log.info("转发成功---------------------------------------");
 //                    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://test.feifanhitech.com/dq/index.html#/workbench-manpower?token="+token);
+//                    response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token);
                 }catch (IOException e){
                     e.printStackTrace();
                 }

dq-financial-hrms-auth/src/main/resources/bootstrap.properties

@@ -15,10 +15,10 @@ spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
 #本地测试环境
-spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
-#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
+spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
 
 #线上生产环境
 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406

dq-financial-hrms/src/main/resources/bootstrap.properties

@@ -15,10 +15,10 @@ spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
 #本地测试环境
-spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
-#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
+spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
 
 #线上生产环境
 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406

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

@@ -34,7 +34,8 @@ public class PromptSuccess {
 
 //    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://test.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"}; // 员工姓名重复时自动加的字母,可再添加
 
@@ -42,7 +43,8 @@ public class PromptSuccess {
 
 //    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://test.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/DgCopyFor.java

@@ -42,6 +42,11 @@ public class DgCopyFor implements Serializable {
      */
     private String picUrl;
 
+    /**
+     * 详情id
+     */
+    private Integer detailId;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

dq-govern-gateway/src/main/resources/bootstrap.properties

@@ -15,10 +15,10 @@ spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
 #本地测试环境
-spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
-#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
+spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
 
 #线上生产环境
 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406