业务管理导出遗留问题处理

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

@@ -60,11 +60,11 @@ public class DgWorkConferenceResponse extends BaseRowModel implements Serializab
 
     @ExcelProperty(value = "A角", index = 7)
     @ApiModelProperty("A角")
-    private String aRoleName;
+    private String aroleName;
 
     @ExcelProperty(value = "B角", index = 8)
     @ApiModelProperty("B角")
-    private String bRoleName;
+    private String broleName;
 
     @ExcelProperty(value = "法规监督部", index = 9)
     @ApiModelProperty("法规监督部")

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

@@ -567,9 +567,9 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
      */
     @Override
     public Boolean excelExport(HttpServletResponse response, List<String> ids,Integer userId) {
-        if (ids == null || ids.size() == 0) {
+/*        if (ids == null || ids.size() == 0) {
             ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
-        }
+        }*/
         List<Integer> idList = new ArrayList<>();
         for (String id : ids) {
             idList.add(Integer.parseInt(id));

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

@@ -37,6 +37,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -87,8 +88,12 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
 
     @Override
     public void batchExport(HttpServletResponse response,String ids,Integer userId) throws IOException {
+        List<String> idList= new ArrayList<>();
+        if(ids!=null && ids !=""){
             String[] id = ids.split(",");
-        List<String> idList = Arrays.asList(id);
+            idList = Arrays.asList(id);
+        }
+
         List<GuaranteeLetterListResponse> excelDataList = baseMapper.selectBatchData(idList,userId);
         EasyExcelUtil.download(response,GuaranteeLetterListResponse.class,excelDataList,"担保函列表","第一页");
     }

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

@@ -313,9 +313,9 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
      */
     @Override
     public Boolean excelExport(HttpServletResponse response, List<String> ids, Integer userId) {
-        if (null == ids || ids.size() == 0) {
+/*        if (null == ids || ids.size() == 0) {
             ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
-        }
+        }*/
         List<Integer> idList = new ArrayList<>();
         for (String id : ids) {
             idList.add(Integer.parseInt(id));

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

@@ -106,8 +106,11 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
 
     @Override
     public void batchExport(HttpServletResponse response, String ids,Integer userId) throws IOException {
+        List<String> idList= new ArrayList<>();
+        if(ids!=null && ids !=""){
             String[] id = ids.split(",");
-        List<String> idList = Arrays.asList(id);
+            idList = Arrays.asList(id);
+        }
         List<LoanNoticeListResponse> excelDataList = baseMapper.selectBatchData(idList, userId);
         EasyExcelUtil.download(response,LoanNoticeListResponse.class,excelDataList,"放款通知列表","第一页");
     }

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

@@ -34,6 +34,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -99,10 +100,13 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
 
     @Override
     public void batchExport(HttpServletResponse response, String ids,Integer userId) throws IOException {
+        List<String> idList= new ArrayList<>();
+        if(ids!=null && ids !=""){
             String[] id = ids.split(",");
-        List<String> idList = Arrays.asList(id);
+            idList = Arrays.asList(id);
+        }
         List<PaymentConfirmationListResponse> excelDataList = baseMapper.selectBatchData(idList,userId);
-        EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"回款确认列表","第一页");
+        EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"财务确认列表","第一页");
     }
 
     @Override

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

@@ -8,10 +8,7 @@ import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper;
 import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper;
 import com.daqing.financial.guarantee.mapper.DgWorkConferenceConsiderMapper;
-import com.daqing.financial.guarantee.model.response.AuditOpinionResponse;
-import com.daqing.financial.guarantee.model.response.DgWorkConferenceConsiderQueryResponse;
-import com.daqing.financial.guarantee.model.response.DgWorkConferenceResponse;
-import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse;
+import com.daqing.financial.guarantee.model.response.*;
 import com.daqing.financial.guarantee.service.IDgCopyForService;
 import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService;
 import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService;
@@ -31,6 +28,7 @@ import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
+import com.daqing.framework.utils.excel.EasyExcelUtil;
 import com.daqing.framework.utils.excel.ExcelUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -373,9 +371,9 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
     @Transactional
     @Override
     public Boolean excelExport(HttpServletResponse response, List<String> ids,Integer userId) {
-        if (ids == null || ids.size() == 0) {
+/*        if (ids == null || ids.size() == 0) {
             ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
-        }
+        }*/
         List<Integer> idList = new ArrayList<>();
         for (String id : ids) {
             idList.add(Integer.parseInt(id));
@@ -407,8 +405,10 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
             }
         }
         try {
-            ExcelUtil.writeExcelWithSheets(response, excelList, "工作会数据一览表", "NO.1", new DgWorkConferenceResponse())
-                    .finish();
+            EasyExcelUtil.download(response, DgWorkConferenceResponse.class,excelList,"财务确认列表","第一页");
+
+/*            ExcelUtil.writeExcelWithSheets(response, excelList, "工作会数据一览表", "NO.1", new DgWorkConferenceResponse())
+                    .finish();*/
         } catch (Exception e) {
             ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
         }
@@ -438,10 +438,10 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
             workConferenceResponse = new DgWorkConferenceResponse();
             for (EmployeeVO employee : employees) {
                 if (Objects.equals(workConference.getAUserId().longValue(), employee.getId())) {
-                    workConferenceResponse.setARoleName(employee.getName());
+                    workConferenceResponse.setAroleName(employee.getName());
                 }
                 if (Objects.equals(workConference.getBUserId().longValue(), employee.getId())) {
-                    workConferenceResponse.setBRoleName(employee.getName());
+                    workConferenceResponse.setBroleName(employee.getName());
                 }
                 if (Objects.equals(workConference.getIUserId().longValue(), employee.getId())) {
                     workConferenceResponse.setRegulationName(employee.getName());

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

@@ -71,8 +71,9 @@
                     #{id}
                 </foreach>
             </if>
-        </where>
+
         ORDER BY a.create_time DESC
+        </where>
     </select>
 
     <!-- 调查 -->

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

@@ -86,11 +86,11 @@
             <if test="userId != null and userId != ''">
                 AND (w.user_id =#{userId} or w.user_id is null)
             </if>
-            <if test="ids != null and ids.size>0">
             AND /*c.del_or_not = 0*/
             /*AND*/ i.role_id = 70
             AND ass.role_id = 64
             AND m.role_id = 67
+            <if test="ids != null and ids.size>0">
                 AND w.id IN
                 <foreach collection="ids" open="(" separator="," close=")" item="id">
                     #{id}

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

@@ -135,12 +135,13 @@ public class UserLoginController implements UserLoginControllerApi {
                 String imgUrl = user.getHeadPortaritUrl();
                 String encoder = "UTF-8";
                 String account = URLEncoder.encode(username,encoder);
+                Long userId = user.getId();
                 String headerImg=null;
                 if(imgUrl !=null)
                   headerImg = URLDecoder.decode(imgUrl,encoder);
                 //account = new String(username.getBytes("GBK"),"iso-8859-1");
-                log.info("account==========="+account+"headerImg============="+headerImg);
-                response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
+                System.out.println("account==========="+account+"headerImg============="+headerImg+"userId===="+userId);
+                response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg+"&userId="+userId);
 //                response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
             }
         }else {

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

@@ -82,6 +82,7 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
             dbUser.setToken(data.getToken());
             dbUser.setAccount(data.getAccount());
             dbUser.setHeadPortaritUrl(data.getHeadPortaritUrl());
+            dbUser.setId(data.getId());
 
 
 /*            SecurityUser userInfo = (SecurityUser) userDetailsService.loadUserByUsername(dbUser.getPhoneAccount());