小程序登录处理

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

@@ -198,12 +198,15 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
                 if(responseResult.getData() != null){
                     employeeMessage = (List<LinkedHashMap>) responseResult.getData();
                 }
-
+                System.out.println("employeeMessage==================="+employeeMessage);
-                for (BusinessApplicationListResponse response:list) {
+
-                    for(LinkedHashMap res : employeeMessage){
+                if(employeeMessage!= null){
-                        if(response.getPresenterId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值
+                    for (BusinessApplicationListResponse response:list) {
-                            response.setAccount(JSONObject.toJSONString(res.get("account")).replace("\"",""));
+                        for(LinkedHashMap res : employeeMessage){
-                            response.setDeptName(JSONObject.toJSONString(res.get("deptName")).replace("\"",""));
+                            if(response.getPresenterId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值
+                                response.setAccount(JSONObject.toJSONString(res.get("account")).replace("\"",""));
+                                response.setDeptName(JSONObject.toJSONString(res.get("deptName")).replace("\"",""));
+                            }
                         }
                     }
                 }

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

@@ -94,7 +94,6 @@ public class DgEfficiencyController {
         return ResponseResult.SUCCESS(dgEfficiencyService.getTodayBusinessCount());
     }
 
-    @ApiOperation(value = "个人效率记录列表")
     /**
      * 首页-通知
      * @Param title 标题

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

@@ -2,23 +2,27 @@ package com.daqing.financial.guarantee.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.daqing.financial.guarantee.model.request.ProcessManageRequest;
+import com.daqing.financial.guarantee.model.request.UpdateUserVisualReq;
 import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
 import com.daqing.financial.guarantee.model.response.DgProessManageRes;
 import com.daqing.financial.guarantee.service.IDgProcessManageService;
 import com.daqing.framework.domain.guarantee.DgProcessManage;
+import com.daqing.framework.domain.hrms.ext.EmployeeVO;
+import com.daqing.framework.domain.hrms.ext.UserDeptVO;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
 
 /**
  * <p>
@@ -29,6 +33,7 @@ import java.util.List;
  * @since 2021-01-15
  */
 @RestController
+@Api(tags = {"流程管理"})
 @RequestMapping("/dg-process-manage")
 public class DgProcessManageController {
 
@@ -61,21 +66,40 @@ public class DgProcessManageController {
     @ApiOperation(value = "查询审批模板对应的可见人员")
     public ResponseResult processVisualList(@RequestParam(value = "id") Integer id){
         //查询可见范围内的人可见列表
-        List<Integer> list = iDgProcessManageService.processVisualList(id);
+        List<EmployeeVO> list = iDgProcessManageService.processVisualList(id);
         return new ResponseResult<PageUtils>().SUCCESS(list);
     }
 
     /**
      * 修改人员可以看到审批模板
-     * @param id 流程管理id  ids 可见人id
+     * @param updateUserVisualReq
      * @return
      */
-    @GetMapping("/updateUserVisual")
+    @PostMapping("/updateUserVisual")
     @ApiOperation(value = "修改人员可以看到审批模板")
-    public ResponseResult updateUserVisual(@RequestParam(value="id") Integer id,@RequestParam(value = "ids") List<Integer>ids){
+    @Transactional
+    public ResponseResult updateUserVisual(@RequestBody UpdateUserVisualReq updateUserVisualReq){
+        Integer id = updateUserVisualReq.getId();
+        List<Integer>ids = updateUserVisualReq.getIds();
         //查询可见范围内的人可见列表
         Boolean a= iDgProcessManageService.updateUserVisual(id,ids);
         return new ResponseResult<PageUtils>().SUCCESS(a);
     }
 
+    /**
+     * 修改基础设置
+     * @param processManageReq
+     * @return
+     */
+    @PostMapping("/updateProcessManage")
+    @ApiOperation(value = "修改基础设置")
+    @Transactional
+    public ResponseResult updateProcessManage(@RequestBody ProcessManageRequest processManageReq){
+        processManageReq.setUpdateTime(new Date());
+        //根据id修改基础设置
+        int a= iDgProcessManageService.updateProcessManage(processManageReq);
+        return a>0 ? ResponseResult.SUCCESS("修改成功！"):ResponseResult.FAIL(40008,"修改失败！");
+
+    }
+
 }

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

@@ -0,0 +1,30 @@
+package com.daqing.financial.guarantee.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * @Author chen
+ * @DATE 2020/11/16 20:16
+ * @Version 1.0
+ * 业务申请列表导出
+ */
+@Data
+public class ProcessManageRequest {
+
+    @ApiModelProperty("流程管理模板id")
+    private Integer id;
+
+    @ApiModelProperty("图标")
+    private String iconImg;
+
+    @ApiModelProperty("审批说明")
+    private String approvalInstructions;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+}

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

@@ -0,0 +1,24 @@
+package com.daqing.financial.guarantee.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Author chen
+ * @DATE 2020/11/16 20:16
+ * @Version 1.0
+ * 业务申请列表导出
+ */
+@Data
+public class UpdateUserVisualReq {
+
+    @ApiModelProperty("流程管理模板id")
+    private Integer id;
+
+    @ApiModelProperty("可见人id")
+    private List<Integer> ids;
+}

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

@@ -1,34 +1,94 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.daqing.framework.utils.excel.ApprovalStatusConverter;
+import com.daqing.framework.utils.excel.BusinessStatusConverter;
+import com.daqing.framework.utils.excel.OperatingStatusConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
 @ToString
 public class DgNoticeListResponse extends BaseRowModel implements Serializable {
 
-    /**
-     * 业务编号
-     */
-    @ExcelProperty(value = "业务编号",index = 0)
     @ApiModelProperty(value = "业务编号")
     private String businessCode;
 
-
-    /**
-     * 申请时间
-     */
-    @ExcelProperty(value = "申请日期",index = 6)
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "申请时间")
     private Date createTime;
 
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "企业id")
+    private Integer companyId;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "业务id")
+    private Integer businessId;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
+    @ApiModelProperty(value = "提单人id")
+    private Integer presenterId;
+
+    @ApiModelProperty(value = "客户名称")
+    private String name;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "业务类型")
+    private String businessType;
+
+    @ApiModelProperty(value = "申请额度")
+    private BigDecimal applyAmount;
+
+    @ApiModelProperty(value = "申请期限")
+    private String applyTime;
+
+    @ApiModelProperty("审核状态")
+    private Integer status;
+
+    @ApiModelProperty("业务状态")
+    private Integer businessStatus;
+
+    @ApiModelProperty("操作状态")
+    private Integer operatingStatus;
+
+//--------------工作会需要内容--------------------------
+
+    @ApiModelProperty("A角")
+    private Integer aUserId;
+
+    @ApiModelProperty("B角")
+    private Integer bUserId;
+
+    @ApiModelProperty("法规部领导")
+    private Integer iUserId;
+
+    @ApiModelProperty("资产部领导")
+    private Integer assUserId;
+
+    @ApiModelProperty("信息部领导")
+    private Integer mUserId;
+//-------------------结束-----------------------------
+
+    @ApiModelProperty("业务管理模块id")
+    private Integer modelId;
 
 }

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

@@ -2,8 +2,11 @@ package com.daqing.financial.guarantee.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.financial.guarantee.model.request.ProcessManageRequest;
 import com.daqing.financial.guarantee.model.response.DgProessManageRes;
 import com.daqing.framework.domain.guarantee.DgProcessManage;
+import com.daqing.framework.domain.hrms.ext.EmployeeVO;
+import com.daqing.framework.domain.hrms.ext.UserDeptVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,7 +23,9 @@ public interface IDgProcessManageService extends IService<DgProcessManage> {
 
     List<DgProcessManage> processManageList(String userId);
 
-    List<Integer> processVisualList(Integer id);
+    List<EmployeeVO> processVisualList(Integer id);
 
     Boolean updateUserVisual(@Param("id") Integer id, @Param("ids") List<Integer> ids);
+
+    int updateProcessManage(@Param("processManageReq")ProcessManageRequest processManageReq);
 }

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

@@ -687,6 +687,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list = new ArrayList();
         for (DgNoticeListResponse res : list1) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：业务申请：" + res.getBusinessCode());
+            res.setModelId(1);
             list.add(res);
         }
 
@@ -694,6 +695,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list2 = guaranteeAssignUserMapper.selectGuaranteeList(userId, roleIdlist);
         for (DgNoticeListResponse res : list2) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：担保部调查：" + res.getBusinessCode());
+            res.setModelId(2);
             list.add(res);
         }
 
@@ -701,6 +703,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list3 = assetsInvestigationMapper.selectAssetsList(userId, roleIdlist);
         for (DgNoticeListResponse res : list3) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：资产部调查：" + res.getBusinessCode());
+            res.setModelId(3);
             list.add(res);
         }
 
@@ -708,6 +711,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list4 = messageInvestigationMapper.selectMessageList(userId, roleIdlist);
         for (DgNoticeListResponse res : list4) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：信息部调查：" + res.getBusinessCode());
+            res.setModelId(4);
             list.add(res);
         }
 
@@ -715,6 +719,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list5 = complianceInvestigationMapper.selectComplianceList(userId, roleIdlist);
         for (DgNoticeListResponse res : list5) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：合规调查：" + res.getBusinessCode());
+            res.setModelId(5);
             list.add(res);
         }
 
@@ -722,6 +727,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list6 = workConferenceConsiderMapper.selectWorkConferenceList(userId, roleIdlist);
         for (DgNoticeListResponse res : list6) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：工作会：" + res.getBusinessCode());
+            res.setModelId(6);
             list.add(res);
         }
 
@@ -729,6 +735,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list7 = loanCommitteeConsiderMapper.selectLoanCommitteeList(userId, roleIdlist);
         for (DgNoticeListResponse res : list7) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：贷审会：" + res.getBusinessCode());
+            res.setModelId(7);
             list.add(res);
         }
 
@@ -736,12 +743,14 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list8 = guaranteeLetterAssignUserMapper.selectGuaranteeLetterList(userId, roleIdlist);
         for (DgNoticeListResponse res : list8) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：担保函：" + res.getBusinessCode());
+            res.setModelId(8);
             list.add(res);
         }
         //回款确认模块，查询该用户待处理的记录
         List<DgNoticeListResponse> list9 = paymentConfirmationConsiderMapper.selectPaymentConfirmationList(userId, roleIdlist);
         for (DgNoticeListResponse res : list9) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：回款确认：" + res.getBusinessCode());
+            res.setModelId(9);
             list.add(res);
         }
 
@@ -749,6 +758,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         List<DgNoticeListResponse> list10 = loanNoticeMapper.selectLoanNoticeList(userId, roleIdlist);
         for (DgNoticeListResponse res : list10) {
             res.setBusinessCode("您有一个待办任务需办理，评审内容：放款通知：" + res.getBusinessCode());
+            res.setModelId(10);
             list.add(res);
         }
         return list;

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

@@ -1,13 +1,20 @@
 package com.daqing.financial.guarantee.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.DgProcessManageMapper;
 import com.daqing.financial.guarantee.mapper.DgProcessManageVisualMapper;
+import com.daqing.financial.guarantee.model.request.ProcessManageRequest;
 import com.daqing.financial.guarantee.model.response.DgProessManageRes;
 import com.daqing.financial.guarantee.service.IDgProcessManageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.framework.domain.guarantee.DgProcessManage;
 import com.daqing.framework.domain.guarantee.DgProcessManageVisual;
+import com.daqing.framework.domain.hrms.ext.EmployeeVO;
+import com.daqing.framework.domain.hrms.ext.UserDeptVO;
+import com.daqing.framework.model.response.ResponseResult;
+import com.daqing.framework.util.RedisUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +35,9 @@ public class DgProcessManageServiceImpl extends ServiceImpl<DgProcessManageMappe
     @Autowired
     private DgProcessManageVisualMapper dgProcessManageVisualMapper;
 
+    @Autowired
+    private HrmsFeignService hrmsFeignService;
+
     @Override
     public List<DgProcessManage> processManageList(String userId) {
 
@@ -36,14 +46,21 @@ public class DgProcessManageServiceImpl extends ServiceImpl<DgProcessManageMappe
     }
 
     @Override
-    public List<Integer> processVisualList(Integer id) {
+    public List<EmployeeVO> processVisualList(Integer id) {
         //根据流程管理id查询可见人id
         List<Integer> visualUserId = dgProcessManageVisualMapper.processVisualList(id);
-        return visualUserId;
+
+        Integer[] userIds =visualUserId.toArray(new Integer[visualUserId.size()]);
+        ResponseResult<List<EmployeeVO>> listResponseResult = hrmsFeignService.listEmpNameByUserId(userIds);
+        List<EmployeeVO> dataList = listResponseResult.getData();
+        return dataList;
     }
 
     @Override
     public Boolean updateUserVisual(Integer id, List<Integer> ids) {
+
+        //查询设置的可见人是否有流程管理页面的权限
+
         //先根据主键id删除所有对应可见模板员工
         dgProcessManageVisualMapper.delete(new QueryWrapper<DgProcessManageVisual>()
                 .eq("process_manage_id",id));
@@ -63,4 +80,11 @@ public class DgProcessManageServiceImpl extends ServiceImpl<DgProcessManageMappe
             return false;
         }
     }
+
+    @Override
+    public int updateProcessManage(ProcessManageRequest processManageReq) {
+        DgProcessManage dgProcessManage = new DgProcessManage();
+        BeanUtils.copyProperties(processManageReq,dgProcessManage);
+        return this.baseMapper.updateById(dgProcessManage);
+    }
 }

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

@@ -40,9 +40,13 @@
     </select>
 
     <select id="selectApplyList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        select au.id,au.role_id,ai.business_code,au.create_time
+        select au.id,au.role_id,ai.company_id,au.business_id,ai.presenter_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_apply_amount_list au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -77,9 +77,13 @@
     </select>
 
     <select id="selectAssetsList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        select au.id,au.role_id,ai.business_code,au.create_time
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_assets_investigation au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -203,9 +203,13 @@
     </select>
 
     <select id="selectComplianceList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        SELECT au.id,au.role_id,ai.business_code,au.create_time
+        SELECT au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.audit_status as status,au.operation_status as operating_status,cc.name,cc.phone,ps.business_status
         FROM dg_compliance_investigation au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -71,9 +71,13 @@
     </update>
 
     <select id="selectGuaranteeList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        select au.id,au.role_id,ai.business_code,au.create_time
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_guarantee_assign_user au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -87,9 +87,13 @@
     </select>
 
     <select id="selectGuaranteeLetterList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        select au.id,au.role_id,ai.business_code,au.create_time
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_guarantee_letter_assign_user au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -151,9 +151,13 @@
         SELECT COUNT(id) FROM dg_guarantee_letter_assign_user WHERE business_id = #{businessId} AND role_id = #{roleId}
     </select>
     <select id="selectLoanCommitteeList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        SELECT au.id,au.role_id,ai.business_code,au.create_time
+        SELECT au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         FROM dg_loan_committee_consider au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -86,9 +86,13 @@
     </select>
 
     <select id="selectLoanNoticeList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        select au.id,au.role_id,ai.business_code,au.create_time
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_loan_notice au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -59,9 +59,13 @@
     </select>
 
     <select id="selectMessageList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        select au.id,au.role_id,ai.business_code,au.create_time
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_message_investigation au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -78,9 +78,13 @@
     </select>
 
     <select id="selectPaymentConfirmationList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        select au.id,au.role_id,ai.business_code,au.create_time
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_payment_confirmation_consider au
         left join dg_apply_amount_info ai on au.business_id = ai.id
+        left join crms_company_customer ccl on ai.company_id = ccl.id
+        left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -8,6 +8,7 @@
         <result column="icon_img" property="iconImg" />
         <result column="model_id" property="modelId" />
         <result column="approval_name" property="approvalName" />
+        <result column="approval_instructions" property="approvalInstructions" />
         <result column="update_time" property="updateTime" />
         <result column="create_time" property="createTime" />
     </resultMap>

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

@@ -131,7 +131,7 @@
         UPDATE dg_work_conference_consider SET user_id = #{userId} WHERE id = #{id}
     </update>
 
-    <select id="selectWorkConferenceList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
+<!--    <select id="selectWorkConferenceList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
         SELECT au.id,au.role_id,ai.business_code,au.create_time
         FROM dg_work_conference_consider au
         left join dg_apply_amount_info ai on au.business_id = ai.id
@@ -145,6 +145,35 @@
             </if>
             AND au.operation_status=1
         </where>
-    </select>
+    </select>-->
 
+    <select id="selectWorkConferenceList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
+    SELECT w.id,w.business_id,a.business_code,a.business_type,a.apply_amount,
+    a.apply_time,a.create_time,c.name,c.phone,
+    w.role_id,w.audit_status AS status,w.operation_status AS operatingStatus,
+    b.business_status,i.user_id AS i_user_id,ass.emp_id AS ass_user_id,m.emp_id AS m_user_id,
+    ab.A AS a_user_id,ab.B AS b_user_id
+    FROM dg_work_conference_consider AS w
+    LEFT JOIN dg_apply_amount_info AS a ON a.id = w.business_id
+    LEFT JOIN crms_company_customer AS cc ON a.company_id = cc.id
+    LEFT JOIN crms_customer AS c ON cc.customer_id = c.id
+    LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id
+    LEFT JOIN (SELECT business_id,SUM(CASE role_id WHEN 59 THEN emp_id ELSE 0 END) AS A,
+    SUM(CASE role_id WHEN 60 THEN emp_id ELSE 0 END) AS B
+    FROM dg_guarantee_assign_user GROUP BY business_id) AS ab
+    ON a.id = ab.business_id
+    LEFT JOIN dg_compliance_investigation AS i ON a.id = i.business_id
+    LEFT JOIN dg_assets_investigation AS ass ON a.id = ass.business_id
+    LEFT JOIN dg_message_investigation AS m ON a.id = m.business_id
+    WHERE c.del_or_not = 0
+    AND (w.user_id = #{userId} OR w.user_id IS NULL)
+    AND w.role_id IN
+    <foreach collection="roleIdlist" open="(" separator="," close=")" item="roleId">
+        #{roleId}
+    </foreach>
+    AND i.role_id = 70
+    AND ass.role_id = 64
+    AND m.role_id = 67
+    AND w.operation_status=1
+    </select>
 </mapper>

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/WeChatConfig.java

@@ -54,6 +54,11 @@ public class WeChatConfig implements Serializable {
      */
     private String OPEN_ACCESS_TOKEN_URL="https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
 
+    /**
+     * 小程序登录请求地址
+     */
+    private String WX_AUTH_URL="https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code";
+
     /**
      * 获取用户信息
      */

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

@@ -1,5 +1,7 @@
 package com.daqing.financial.hrauth.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.daqing.financial.hrauth.UserLoginControllerApi;
 import com.daqing.financial.hrauth.config.WeChatConfig;
 import com.daqing.financial.hrauth.feign.HrmsFeignService;
@@ -15,12 +17,19 @@ import com.daqing.framework.util.SendUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -156,8 +165,8 @@ public class UserLoginController implements UserLoginControllerApi {
                   headerImg = URLDecoder.decode(imgUrl,encoder);
                 //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("http://8.129.127.185:8080/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
-                response.sendRedirect("http://www.huorantech.cn/dq/index.html#/Dashboard?token="+token+"&account="+account+"&headerImg="+headerImg);
+                response.sendRedirect("https://www.huorantech.cn/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
             }
         }else {
             userService.weChatBinding(code,response,state);
@@ -205,4 +214,15 @@ public class UserLoginController implements UserLoginControllerApi {
         return result>0 ? ResponseResult.SUCCESS() : ResponseResult.FAIL(55002,"该手机号不存在");
     }
 
+    /**
+     * 微信小程序获取openid和session_key授权登录
+     * @param code
+     * @return
+     */
+    @RequestMapping(value = "/wxAuthLogin")
+    public String wxAuthLogin(String code){
+
+        return userLoginService.wxAuthLogin(code);
+    }
+
 }

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

@@ -22,4 +22,6 @@ public interface UserLoginService extends IService<UserEntity> {
     boolean bindPhoneAndOpenId(BindOpenIdRequest bindOpenIdRequest);
 
     int isPhoneExist(String mobile);
+
+    String wxAuthLogin(String code);
 }

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

@@ -1,5 +1,6 @@
 package com.daqing.financial.hrauth.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,12 +26,21 @@ import com.daqing.framework.util.Md5Util;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.util.SendUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.*;
 
 /**
@@ -305,4 +315,42 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
         return userLoginDao.selectCount(mobile);
     }
 
+    @Override
+    public String wxAuthLogin(String code) {
+        System.out.println(code);
+        System.out.println("来了小程序登录------------------------------------");
+        //微信那边的接口，grant_type=authorization_code是固定的
+/*        String url="https://api.weixin.qq.com/sns/jscode2session?appid="+APPID+
+                "&secret="+SECRET+"&js_code="+ code +"&grant_type=authorization_code";*/
+
+        String url = weChatConfig.getWX_AUTH_URL();
+        System.out.println("url==============="+url);
+        //发送请求给微信后端
+        CloseableHttpClient httpClient= HttpClients.createDefault();
+        HttpGet httpGet=new HttpGet(url);
+        InputStream inputStream=null;
+        CloseableHttpResponse httpResponse=null;
+        StringBuilder result=new StringBuilder();
+        try {
+            httpResponse=httpClient.execute(httpGet);
+            HttpEntity entity=httpResponse.getEntity();
+            inputStream=entity.getContent();
+            BufferedReader bufferedReader=new BufferedReader(new InputStreamReader(inputStream));
+            String line="";
+            while ((line=bufferedReader.readLine())!=null){
+                System.out.println(line); //这里需要使用fastjson来提取一下内容
+                JSONObject jsonObject= JSON.parseObject(line);
+                Login login=new Login();
+                login.setOpenid(jsonObject.getString("openid"));
+                login.setSession_key(jsonObject.getString("session_key"));
+                result.append(login.getOpenid()+"hello_world"+login.getSession_key());
+                System.out.println(result.toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return result.toString();
+    }
+
 }

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

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

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

@@ -32,7 +32,7 @@ public class PromptSuccess {
 
     public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径
 
-    public static final String IMAGE_URL_PATH = "http://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:8080/headImg/"; // 数据库/预加载图片路径
     //public static final String IMAGE_URL_PATH = "http://47.107.237.129:8080/headImg/"; // 数据库/预加载图片路径
 
@@ -40,7 +40,7 @@ public class PromptSuccess {
 
     public static final String STATUS_REFUSE = "拒绝";
 
-    public static final String ENCLOSUREFILE_URL_PATH = "http://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:8080/enclosureFile/"; // 附件文件存放路径
     //public static final String ENCLOSUREFILE_URL_PATH = "http://47.107.237.129:8080/enclosureFile/"; // 附件文件存放路径
 

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

@@ -44,6 +44,11 @@ public class DgProcessManage implements Serializable {
      */
     private String approvalName;
 
+    /**
+     * 审批说明
+     */
+    private String approvalInstructions;
+
     /**
      * 更新时间
      */

dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/Login.java

@@ -0,0 +1,31 @@
+package com.daqing.framework.domain.hrms;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 记录部门信息
+ * 
+ * @author gongsj
+ * @email gongsj@gmail.com
+ * @date 2020-09-07 17:12:14
+ */
+@Data
+@TableName("hrms_dept")
+public class Login implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String openid;
+
+	private String session_key;
+
+}

dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 public class EmployeeVO implements Serializable{
 
     /**
-     * 员工id
+     * 用户id
      */
     @ApiModelProperty("id")
     private Long id;