1

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java

@@ -97,6 +97,7 @@ public class MemberApplyMineController {
                     LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
                     LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
                     LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                    LEFT JOIN vw_user u on info.userId=u.id
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoInputController.java

@@ -7,6 +7,7 @@ import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.sys.models.Sys_union;
 import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord;
 import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm;
 import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -75,6 +76,19 @@ public class MemberInfoInputController {
         }
     }
 
-
+    @At
+    @POST
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission("member.info.input")
+    @SLog(tag = "人员补录",  msg = "删除会员")
+    public Result doDelete(String id, String userId) {
+        try {
+            memberInfoService.dao().delete(MemberChangeRecord.class, id);
+            memberInfoService.dao().delete(Sys_user.class, userId);
+            return Result.success("删除成功");
+        } catch (Exception e) {
+            return Result.error(e.getMessage());
+        }
+    }
 
 }

src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java

@@ -30,6 +30,10 @@ public class MemberApplyPageForm extends PageForm {
 
     private List<String> preparedBys;
 
+    private String aidFundMemberUserType;   //人员分类
+
+    private String userAttribute;       //人员属性
+
     public static void buildSearch(Cnd cnd, MemberApplyPageForm pageForm) {
         if (cnd == null) {
             cnd = Cnd.NEW();
@@ -45,5 +49,7 @@ public class MemberApplyPageForm extends PageForm {
         cnd.andEX("info.userState","in",pageForm.getUserStates());
         cnd.andEX("info.personType","in",pageForm.getPersonTypes());
         cnd.andEX("info.preparedBy","in",pageForm.getPreparedBys());
+        cnd.andEX("u.aidFundMemberUserType","=",pageForm.getAidFundMemberUserType());
+        cnd.andEX("u.userAttribute","=",pageForm.getUserAttribute());
     }
 }

src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java

@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.staffmanage.member.param.pageform;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.param.PageForm;
@@ -115,6 +116,10 @@ public class MemberInfoPageForm extends PageForm {
             cnd = Cnd.NEW();
         }
 
+        if(ObjectUtil.isNotEmpty(this.year)) {
+            cnd.and("year(applyDateTime)", "=", this.getYear());
+        }
+
         if (Lang.isNotEmpty(this.getUserIds())) {
             List<String> userIds = Optional.ofNullable(this.getUserIds()).orElse(Collections.emptyList())
                     .stream().filter(StrUtil::isNotBlank).toList();

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java

@@ -218,8 +218,12 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
         List<Sys_dict> dictList = sysDictService.getSubListByCode("ALLOW_CHANGE_FIELDS");
         Set<String> allowChangeFieldNames = dictList.stream().map(Sys_dict::getCode).collect(Collectors.toSet());
         allowChangeFieldNames.add("member");
+        allowChangeFieldNames.add("aidFundMemberUserType");
+        allowChangeFieldNames.add("userAttribute");
         Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(Sys_dict::getCode, Sys_dict::getName));
         dictMap.put("member", "会员状态");
+        dictMap.put("aidFundMemberUserType", "人员分类");
+        dictMap.put("userAttribute", "人员属性");
         return NutMap.NEW().addv("allowChangeFieldNames", allowChangeFieldNames).addv("dictMap", dictMap);
     }