保单列表

national-motion-base-core/src/main/java/org/jeecg/common/util/DictAnnotationUtil.java

@@ -59,7 +59,7 @@ public class DictAnnotationUtil {
     /**
      * 翻译单个对象的字典字段
      */
-    private static void translateDict(Object obj) {
+    public  static void translateDict(Object obj) {
         if (obj == null) return;
 
         System.out.println(JSONObject.toJSONString(obj));

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppInsureController.java

@@ -167,7 +167,7 @@ public class AppInsureController extends JeecgController<AppInsure, IAppInsureSe
 	  *
 	  */
 	 //@AutoLog(value = "保险表-分页列表查询")
-	 @Operation(summary="保险表-分页列表查询")
+	 @Operation(summary="保险表-根据保险公司id分页列表查询")
 	 @GetMapping(value = "/findByList")
 	 public Result<List<AppInsure>> findByList(@RequestParam(name="insuranceName",required=true) String insuranceName) {
 		 LambdaQueryWrapper<AppInsure> query = new LambdaQueryWrapper<>();

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/InsureOrderInfoController.java

@@ -100,7 +100,6 @@ public class InsureOrderInfoController extends JeecgController<InsureOrderInfo,
 	 */
 	@AutoLog(value = "保险订单-修改筛选数据")
 	@Operation(summary="保险订单-修改筛选数据")
-	@RequiresPermissions("insureOrderInfo:nm_insure_order_info:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> updateBatch(FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO) {
 		return insureOrderInfoService.updateBatch(findInsureOrderPageRequestDTO);
@@ -132,7 +131,7 @@ public class InsureOrderInfoController extends JeecgController<InsureOrderInfo,
 	@Operation(summary="保险订单-导出")
     @RequestMapping(value = "/exportXls")
     public void exportXls(HttpServletRequest request,HttpServletResponse response, FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO) {
-		insureOrderInfoService.exportXls(request,response, findInsureOrderPageRequestDTO,findInsureOrderPageRequestDTO.getInsureCompany_dictText() +"保险订单");
+		insureOrderInfoService.exportXls(request,response, findInsureOrderPageRequestDTO);
     }
 
     /**

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/insureOrder/FindInsureOrderPageRequestDTO.java

@@ -20,7 +20,8 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @NoArgsConstructor
 @Schema(description="投保信息请求入参")
 public class FindInsureOrderPageRequestDTO extends PageDTO {
-
+    @Schema(description = "id")
+    private String id;
 
     @Schema(description = "保险订单号")
     private String bdOrderNo;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/insureOrder/FindInsureOrderPageResponseDTO.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import org.jeecg.modules.app.dto.PageDTO;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -22,7 +21,11 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description="投保信息请求入参")
-public class FindInsureOrderPageResponseDTO extends PageDTO {
+public class FindInsureOrderPageResponseDTO{
+
+
+    @Schema(description = "id")
+    private String id;
 
     @Schema(description = "保险订单编号")
     private String bdOrderNo;
@@ -60,9 +63,9 @@ public class FindInsureOrderPageResponseDTO extends PageDTO {
     @Schema(description = "是否录入系统 0-否 1-是")
     private Integer isEnterSystem;
     /**创建时间;创建时间*/
-    @Excel(name = "付款时间", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Excel(name = "付款时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "付款时间")
     private Date payTime;
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/InsureOrderInfoMapper.xml

@@ -82,6 +82,9 @@
         <if test="findInsureOrderPageRequestDTO.bdOrderNo != null and findInsureOrderPageRequestDTO.bdOrderNo != ''">
             AND a.bd_order_no = #{findInsureOrderPageRequestDTO.bdOrderNo}
         </if>
+        <if test="findInsureOrderPageRequestDTO.id != null and findInsureOrderPageRequestDTO.id != ''">
+            AND a.id = #{findInsureOrderPageRequestDTO.id}
+        </if>
         <if test="findInsureOrderPageRequestDTO.insureName != null and findInsureOrderPageRequestDTO.insureName != ''">
             AND a.insure_name = #{findInsureOrderPageRequestDTO.insureName}
         </if>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IInsureOrderInfoService.java

@@ -22,5 +22,5 @@ public interface IInsureOrderInfoService extends IService<InsureOrderInfo> {
 
     Result<String> updateBatch(FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO);
 
-    void exportXls(HttpServletRequest request, HttpServletResponse response, FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO, String fileName);
+    void exportXls(HttpServletRequest request, HttpServletResponse response, FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/InsureOrderInfoServiceImpl.java

@@ -9,6 +9,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.util.DictAnnotationUtil;
 import org.jeecg.common.util.idCard.ChineseIdCard18Utils;
 import org.jeecg.common.util.idCard.Gender;
 import org.jeecg.modules.system.app.dto.insureOrder.FindInsureOrderPageRequestDTO;
@@ -48,6 +49,7 @@ public class InsureOrderInfoServiceImpl extends ServiceImpl<InsureOrderInfoMappe
     @Override
     public Result<IPage<FindInsureOrderPageResponseDTO>> findPage(FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO) {
         getFindInsureOrderPageRequestDTO(findInsureOrderPageRequestDTO);
+        DictAnnotationUtil.translateDict(findInsureOrderPageRequestDTO);
         Page<FindInsureOrderPageResponseDTO> page = new Page<FindInsureOrderPageResponseDTO>(findInsureOrderPageRequestDTO.getPageNo(), findInsureOrderPageRequestDTO.getPageSize());
         IPage<FindInsureOrderPageResponseDTO> findInsureOrderPageResponseDTOIPage = insureOrderInfoMapper.findPage(page, findInsureOrderPageRequestDTO);
         if (findInsureOrderPageResponseDTOIPage!=null&&findInsureOrderPageResponseDTOIPage.getRecords()!=null){
@@ -56,7 +58,7 @@ public class InsureOrderInfoServiceImpl extends ServiceImpl<InsureOrderInfoMappe
                 record.setIdentityCard(desensitization);
             }
         }
-        return Result.ok();
+        return Result.ok(findInsureOrderPageResponseDTOIPage);
     }
 
     @Override
@@ -74,11 +76,12 @@ public class InsureOrderInfoServiceImpl extends ServiceImpl<InsureOrderInfoMappe
     }
 
     @Override
-    public void exportXls(HttpServletRequest request, HttpServletResponse response, FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO, String fileName) {
+    public void exportXls(HttpServletRequest request, HttpServletResponse response, FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO) {
         String timestamp = String.valueOf(System.currentTimeMillis());
-        String outputFilename = "被保险人清单_" + timestamp ;
+        DictAnnotationUtil.translateDict(findInsureOrderPageRequestDTO);
+        String outputFilename = findInsureOrderPageRequestDTO.getInsureCompany_dictText() +"保险订单_被保险人清单_" + timestamp ;
         List<FindInsureOrderPageResponseDTO> byList = insureOrderInfoMapper.findByList(findInsureOrderPageRequestDTO);
-        writeToExcel(byList,response,outputFilename);
+        writeToExcel(byList,response,outputFilename,findInsureOrderPageRequestDTO.getInsureCompany());
     }
 
 
@@ -91,7 +94,7 @@ public class InsureOrderInfoServiceImpl extends ServiceImpl<InsureOrderInfoMappe
         }
     }
 
-    public void writeToExcel(List<FindInsureOrderPageResponseDTO> persons,HttpServletResponse response, String outputFilename ) throws JeecgBootException {
+    public void writeToExcel(List<FindInsureOrderPageResponseDTO> persons,HttpServletResponse response, String outputFilename,Integer insureCompany ) throws JeecgBootException {
 
         setResponseHeaders(response, outputFilename);
         // 参数校验
@@ -112,7 +115,14 @@ public class InsureOrderInfoServiceImpl extends ServiceImpl<InsureOrderInfoMappe
                 FindInsureOrderPageResponseDTO person = persons.get(i);
                 validatePersonData(person);
                 Row row = sheet.createRow( startRowNum+ i);
-                writePersonRow(row, person, i + 1,cellStyles); // 序号从1开始
+                if (insureCompany==1){
+                    writePersonRow(row, person, i + 1,cellStyles); // 序号从1开始
+                } else if (false) {
+
+                }else {
+                    writePersonRow(row, person, i + 1,cellStyles); // 序号从1开始
+                }
+
             }
             workbook.write(out);
             out.flush();