feat:人员接口新增

base/nckd-base-common/src/main/java/nckd/base/common/model/BasePageModel.java

@@ -27,18 +27,18 @@ public class BasePageModel extends BaseModel implements Serializable {
         this.pageNo = pageNo;
     }
 
-    public List<Object> getRows() {
+    public List getRows() {
         return this.rows;
     }
 
-    public void setRows(List<Object> rows) {
+    public void setRows(List rows) {
         this.rows = rows;
     }
 
     public BasePageModel() {
     }
 
-    public BasePageModel(Integer pageNo, Integer pageSize, List<Object> rows) {
+    public BasePageModel(Integer pageNo, Integer pageSize, List rows) {
         this.pageNo = pageNo;
         this.pageSize = pageSize;
         this.rows = rows;

nckd-fi/src/main/java/nckd/fi/er/webapi/cutomer/UserQueryWebApiPlugin.java

@@ -14,6 +14,7 @@ import kd.bos.servicehelper.QueryServiceHelper;
 import nckd.base.common.constant.BaseFieldConst;
 import nckd.base.common.constant.BosUserConstant;
 import nckd.base.common.enums.BillStatusEnum;
+import nckd.base.common.model.BaseModel;
 import nckd.base.common.model.BasePageModel;
 import nckd.base.common.utils.QFilterUtils;
 import nckd.fi.er.common.constant.ErPayeerConstant;
@@ -22,6 +23,7 @@ import nckd.fi.er.webapi.model.BosUserModel;
 import nckd.fi.er.webapi.model.PayeeBankModel;
 import nckd.fi.er.webapi.model.ReimburseSetModel;
 import nckd.base.common.utils.DoMoConvertUtils;
+import nckd.fi.er.webapi.model.UserPageModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -39,14 +41,14 @@ public class UserQueryWebApiPlugin implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiPostMapping(desc = "查询人员数据", value = "/queryUserList")
-    public CustomApiResult<List<BosUserModel>> queryUserList(
+    public CustomApiResult<UserPageModel> queryUserList(
             @ApiParam("员工姓名") String username,
             @ApiParam("员工id") String userid,
             @ApiParam("员工编码") String userno,
             @ApiParam("修改时间") Date updatetime,
             @ApiParam(example = "10", value = "页码") Integer pageSize,
             @ApiParam(example = "1", value = "当前页") Integer pageNo) {
-        QFilter qFilter = new QFilter(BosUserConstant.ENABLE, QCP.equals,"1");
+        QFilter qFilter = new QFilter(BosUserConstant.ENABLE, QCP.in,new String[]{"1","0"});
 
         if(StringUtils.isNotEmpty(username)){
             qFilter.and(BosUserConstant.NAME, QCP.equals,username);
@@ -123,9 +125,7 @@ public class UserQueryWebApiPlugin implements Serializable {
                 user.setReimeburentry(reimburMap.get(userNum));
             }
         }
-
-        BasePageModel basePageModel = new BasePageModel(pageNo, pageSize, Collections.singletonList(userModelList));
-        return CustomApiResult.success(userModelList);
+        return CustomApiResult.success(new UserPageModel(pageNo, pageSize,userModelList));
     }
 
 
@@ -189,14 +189,6 @@ public class UserQueryWebApiPlugin implements Serializable {
     private static String getErReimburseFields() {
         return String.join(",",
                 ErReimburseSettingConstant.NUMBER
-//                ErReimburseSettingConstant.REIMLEVELENTRY
-//                ErReimburseSettingConstant.REIMLEVELENTRY + StrUtil.DOT + ErReimburseSettingConstant.PARTJOB
-//                ErReimburseSettingConstant.REIMLEVELENTRY + StrUtil.DOT + ErReimburseSettingConstant.COMPANY,
-//                ErReimburseSettingConstant.REIMLEVELENTRY + StrUtil.DOT + ErReimburseSettingConstant.COMPANY + BaseFieldConst.PNAME,
-//                ErReimburseSettingConstant.REIMLEVELENTRY + StrUtil.DOT + ErReimburseSettingConstant.COMPANY + BaseFieldConst.PNUMBER,
-//                ErReimburseSettingConstant.REIMLEVELENTRY + StrUtil.DOT + ErReimburseSettingConstant.ENTRYREIMBURSELEVEL,
-//                ErReimburseSettingConstant.REIMLEVELENTRY + StrUtil.DOT + ErReimburseSettingConstant.ENTRYREIMBURSELEVEL + BaseFieldConst.PNAME,
-//                ErReimburseSettingConstant.REIMLEVELENTRY + StrUtil.DOT + ErReimburseSettingConstant.ENTRYREIMBURSELEVEL + BaseFieldConst.PNUMBER
                 );
     }
 

nckd-fi/src/main/java/nckd/fi/er/webapi/model/BosUserModel.java

@@ -77,7 +77,7 @@ public class BosUserModel extends BaseModel implements Serializable {
     @ApiParam(value = "手机")
     private String phone ;
     @ApiParam(value = "部门分录")
-    private List<BosUserEntityModel> entityentry ;
+    private List<BosUserEntityModel> entryentity ;
 
     @ApiParam(value = "联系人分录")
     private List<BosUserContactEtModel> contactentity ;
@@ -332,12 +332,12 @@ public class BosUserModel extends BaseModel implements Serializable {
         this.phone = phone;
     }
 
-    public List<BosUserEntityModel> getEntityentry() {
-        return entityentry;
+    public List<BosUserEntityModel> getEntryentity() {
+        return entryentity;
     }
 
-    public void setEntityentry(List<BosUserEntityModel> entityentry) {
-        this.entityentry = entityentry;
+    public void setEntryentity(List<BosUserEntityModel> entryentity) {
+        this.entryentity = entryentity;
     }
 
     public List<BosUserContactEtModel> getContactentity() {

nckd-fi/src/main/java/nckd/fi/er/webapi/model/UserPageModel.java

@@ -0,0 +1,49 @@
+package nckd.fi.er.webapi.model;
+
+import kd.bos.openapi.common.custom.annotation.ApiParam;
+import nckd.base.common.model.BaseModel;
+
+import java.util.List;
+
+/**
+ * @Author：Zt
+ * @Date：2025/12/9
+ **/
+public class UserPageModel extends BaseModel {
+    private @ApiParam("页码") Integer pageSize;
+    private @ApiParam("当前页") Integer pageNo;
+    private @ApiParam("数据") List<BosUserModel> rows;
+
+    public Integer getPageSize() {
+        return this.pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPageNo() {
+        return this.pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public List<BosUserModel> getRows() {
+        return this.rows;
+    }
+
+    public void setRows(List<BosUserModel> rows) {
+        this.rows = rows;
+    }
+
+    public UserPageModel() {
+    }
+
+    public UserPageModel(Integer pageNo, Integer pageSize, List<BosUserModel> rows) {
+        this.pageNo = pageNo;
+        this.pageSize = pageSize;
+        this.rows = rows;
+    }
+}