添加黑名单

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerBlackController.java

@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Objects;
 
 /**
-* 失信人员
+* 失信人员 - 手动加进去的人员
+ * 黑名单 - 非上海30天进黑名单
 *
 * @author fly
 */
@@ -39,14 +40,36 @@ public class BmWorkerBlackController extends BaseController {
     private BmWorkerBlackService service;
 
     /**
-     * 查询列表-黑名单人员
+     * 查询列表-失信人员人员
+     * * 失信人员 - 手动加进去的人员
+     * * 黑名单 - 非上海30天进黑名单
      * @param o
      * @return
      */
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:list"))
     @GetMapping("/getWorkerBlackList")
-    @SysLog(title = "人员黑名单", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->红绿灯统计", details = "黑名单人员列表")
+    @SysLog(title = "失信人员", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->红绿灯统计", details = "失信人员列表")
     public TableDataInfo getWorkerBlackList(BmWorkerBlack o) {
+        o.setIsHand(1);
+        return getWorkerList(o);
+    }
+
+    /**
+     * 查询列表-黑名单人员
+     * * 失信人员 - 手动加进去的人员
+     * * 黑名单 - 非上海30天进黑名单
+     * @param o
+     * @return
+     */
+    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:list"))
+    @GetMapping("/getWorkerBlackListAuto")
+    @SysLog(title = "黑名单人员", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->红绿灯统计", details = "黑名单人员")
+    public TableDataInfo getWorkerBlackListAuto(BmWorkerBlack o) {
+        o.setIsHand(0);
+        return getWorkerList(o);
+    }
+
+    public TableDataInfo getWorkerList(BmWorkerBlack o) {
         try {
             startPage();
             List<BmWorkerBlack> list = service.getWorkerBlackList(o);
@@ -58,13 +81,13 @@ public class BmWorkerBlackController extends BaseController {
     }
 
     /**
-     * 黑名单人员添加
+     * 失信人员人员添加
      * @param fileMsg
      * @return
      */
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:insert"))
     @PostMapping("/insert")
-    @SysLog(title = "人员入场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "黑名单人员添加")
+    @SysLog(title = "失信人员添加", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "失信人员添加")
     public AjaxResult insert(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) {
         try {
 
@@ -81,13 +104,13 @@ public class BmWorkerBlackController extends BaseController {
     }
 
     /**
-     * 黑名单人员解除
+     * 失信人员人员解除
      * @param
      * @return
      */
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:query"))
     @PostMapping("/remove/{id}")
-    @SysLog(title = "人员黑名单", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->人员黑名单", details = "黑名单人员解除")
+    @SysLog(title = "失信人员", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->失信人员", details = "失信人员解除")
     public AjaxResult edit(@PathVariable("id") String idNumber) {
         try {
             return toAjax(service.updateByPrimaryKey(idNumber));
@@ -104,8 +127,26 @@ public class BmWorkerBlackController extends BaseController {
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:export"))
     @PostMapping("/workerBlackExport")
     @SysLog(title = "失信人员导出", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->红绿灯管理->失信人员管理", details = "失信人员导出")
-    public void export(HttpServletResponse response, BmWorkerBlack o) {
+    public void workerBlackExport(HttpServletResponse response, BmWorkerBlack o) {
         try {
+            o.setIsHand(1);
+            List<BmWorkerBlack> list = service.getWorkerBlackList(o);
+            ExcelUtil<BmWorkerBlack> util = new ExcelUtil<>(BmWorkerBlack.class);
+            util.exportExcel(response, list, "失信人员导出");
+        } catch (Exception e) {
+            logger.error(e.toString(), e);
+        }
+    }
+
+    /**
+     * 失信人员导出
+     */
+    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:export"))
+    @PostMapping("/workerBlackAutoExport")
+    @SysLog(title = "黑名单人员导出", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->红绿灯管理->失信人员管理", details = "失信人员导出")
+    public void workerBlackAutoExport(HttpServletResponse response, BmWorkerBlack o) {
+        try {
+            o.setIsHand(0);
             List<BmWorkerBlack> list = service.getWorkerBlackList(o);
             ExcelUtil<BmWorkerBlack> util = new ExcelUtil<>(BmWorkerBlack.class);
             util.exportExcel(response, list, "失信人员导出");

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java

@@ -99,7 +99,7 @@ public class PmWorkerController extends BaseController {
 
     /**
      * 根据id查询详情
-     * @param id
+     * @param o
      * @return
      */
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:query"))

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerBlack.java

@@ -97,4 +97,6 @@ public class BmWorkerBlack extends BaseEntity {
      * 文件列表
      */
     List<UploadFileVo> contractFile;
+
+    private int isHand;
 }

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePagePmWorkerVo.java

@@ -81,7 +81,6 @@ public class HomePagePmWorkerVo {
     private String einTime;
 
 
-
     private String deviceCode;
 
     private String deviceName;
@@ -124,4 +123,5 @@ public class HomePagePmWorkerVo {
      */
     private List<UploadFileVo> wageFiles;
 
-}
+    private String bankIdentifierCode;
+}

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppServiceImpl.java

@@ -351,6 +351,7 @@ public class AppServiceImpl implements AppService {
         if (bmWorkerContract != null && StringUtil.isNotEmpty(bmWorkerContract.getContractStartDate())) {
             bmWorkerContract.setCreateUser(SecurityUtils.getLoginUser().getSysUser().getUserName());
             bmWorkerContract.setWorkerId(record.getId());
+            bmWorkerContract.setProId(record.getProId());
             updateWorkerContract(bmWorkerContract);
             record.setContractId(bmWorkerContract.getId());
         }

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerBlackMapper.xml

@@ -60,6 +60,9 @@
       <if test="idNumber != null and idNumber != ''">
         and id_number LIKE CONCAT('%',#{idNumber},'%')
       </if>
+      <if test="isHand != null">
+        and is_hand = #{isHand}
+      </if>
     </where>
   </select>
 

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml

@@ -374,7 +374,8 @@
     bwwc.id as wage_card_id,
     bwwc.bank_name,
     bwwc.bank_branch_name,
-    bwwc.bank_card_code
+    bwwc.bank_card_code,
+    bwwc.bank_identifier_code
     FROM
     pm_worker pw
     INNER JOIN bm_worker_ein_msg bwem ON pw.id = bwem.worker_id

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml

@@ -113,7 +113,7 @@
     <if test="subComId != null and subComId != ''">
       AND (pp.sub_com_id = #{subComId} or pp.sub_com_id is null)
     </if>
-    order by bwem.ein_status desc
+    order by pw.create_time DESC
     </select>
 
   <select id="getWorkerByNumber" resultMap="BaseResultMap">

bonus-modules/bonus-job/src/main/java/com/bonus/job/domain/BmWorkerBlackJob.java

@@ -10,80 +10,81 @@ import lombok.Data;
 public class BmWorkerBlackJob {
 
     //用于excel导出的序号一列,不需要业务逻辑处理
-    @Excel(name = "序号", isSequence = true, type = Excel.Type.EXPORT,sort = 1)
+    @Excel(name = "序号", isSequence = true, type = Excel.Type.EXPORT, sort = 1)
     int sequence;
 
     /**
-    * 编号
+     * 编号
-    */
+     */
     private Integer id;
 
     /**
-    * 施工人员id
+     * 施工人员id
-    */
+     */
     private Integer workerId;
 
     /**
-    * 身份证
+     * 身份证
-    */
+     */
-    @Excel(name = "身份证号",  sort = 3)
+    @Excel(name = "身份证号", sort = 3)
     private String idNumber;
 
     /**
-    * 姓名
+     * 姓名
-    */
+     */
     @Excel(name = "姓名", sort = 2)
     private String name;
 
     /**
-    * 岗位
+     * 岗位
-    */
+     */
     @Excel(name = "工种", sort = 4)
     private String postName;
 
     /**
-    * 工程
+     * 工程
-    */
+     */
     @Excel(name = "工程名称", sort = 5)
     private String proName;
 
     /**
-    * 分包
+     * 分包
-    */
+     */
     @Excel(name = "所属分包单位", sort = 6)
     private String subName;
 
     /**
-    * 理由
+     * 理由
-    */
+     */
     @Excel(name = "事件", sort = 7)
     private String reason;
 
     /**
-    * 开始时间
+     * 开始时间
-    */
+     */
     @Excel(name = "开始时间", sort = 8)
     private String startTime;
 
     /**
-    * 结束时间
+     * 结束时间
-    */
+     */
     @Excel(name = "结束时间", sort = 9)
     private String endTime;
 
     /**
-    * 是否解除 0 未解除 1 已解除
+     * 是否解除 0 未解除 1 已解除
-    */
+     */
-    @Excel(name = "是否解除", type = Excel.Type.EXPORT, sort = 10,readConverterExp = "执行中=0,已解除=1,已到解除时间=2")
+    @Excel(name = "是否解除", type = Excel.Type.EXPORT, sort = 10, readConverterExp = "执行中=0,已解除=1,已到解除时间=2")
     private Integer isRemove;
 
     /**
-    * 创建人
+     * 创建人
-    */
+     */
     private String createUser;
 
     /**
-    * 修改人
+     * 修改人
-    */
+     */
     private String updateUser;
-}
+    private int isHand;
+}

bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml

@@ -75,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 
 
+	<!--		'永久' as startTime,-->
+	<!--		'永久' as endTime-->
 	<select id="getWorkerExitThan30Day" resultType="com.bonus.job.domain.BmWorkerBlackJob">
 		SELECT
 		bwepr.id,
@@ -85,8 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		bwepr.sub_name,
 		bwepr.post_name,
 		'出场30天未上传《离场人员工资结算确认单》' as reason,
-		'永久' as startTime,
+		0 as is_hand,
-		'永久' as endTime
+		CURDATE() as startTime,
+		DATE_ADD(CURDATE(), INTERVAL 1 YEAR) as endTime
 		FROM
 		pm_worker pw
 		LEFT JOIN bm_worker_ein_pro_record bwepr ON pw.id = bwepr.worker_id