add:统计打包企业等字段调整

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java

@@ -8,6 +8,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.system.vo.SysDepartTreeModel;
 import com.jero.common.util.oConvertUtils;
@@ -19,6 +20,8 @@ import com.jero.member.service.ITbMemberProjectService;
 import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
+import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.system.util.UserUtil;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkGroupSubletStatistics;
 import com.jero.project.entity.PayWorkingGroupStatistics;
@@ -41,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.text.DecimalFormat;
 import java.util.*;
@@ -60,6 +64,8 @@ public class AllProjectStatisticsController {
     @Autowired
     private ISysBaseAPI sysBaseAPI;
     @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
     private IPayWorkingGroupService payWorkingGroupService;
 
     /**
@@ -360,4 +366,16 @@ public class AllProjectStatisticsController {
             }
 
 
+    @ApiOperation(value = "查询列表", notes = "查询列表")
+    @RequestMapping(value = "/listForUserByOrgCode", method = RequestMethod.GET)
+    public Result<?> listForUserByOrgCode(@RequestParam(name = "departId",required = true) String departId) {
+        List<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(departId);
+        List<String> orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList());
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("org_code",orgCodes);
+        queryWrapper.ne("username","_reserve_user_external");
+        List<SysUser> pageList = sysUserService.list(queryWrapper);
+        return  Result.OK(pageList);
+    }
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java

@@ -17,10 +17,6 @@ public class AllProjectStatistics {
     @ApiModelProperty(value = "来款项目")
     private String projectName;
 
-    @Excel(name = "项目负责人", width = 15)
-    @ApiModelProperty(value = "项目负责人")
-    private String principalName;
-
     @Excel(name = "来款单位", width = 15)
     @ApiModelProperty(value = "来款单位")
     private String chargeCompanyTemporaryName;
@@ -36,11 +32,19 @@ public class AllProjectStatistics {
     @ApiModelProperty(value = "来款用途编码")
     private String chargeUse;
 
+    @Excel(name = "来款用途", width = 15)
+    @ApiModelProperty(value = "来款用途")
+    private String ChargeUse_text;
+
+    @Excel(name = "打包", width = 15)
+    @ApiModelProperty(value = "打包")
+    private String pack;
+
     @Excel(name = "科室", width = 15)
     @ApiModelProperty(value = "科室")
     private String depart;
 
-    @Excel(name = "来款用途", width = 15)
-    @ApiModelProperty(value = "来款用途")
-    private String ChargeUse_text;
+    @Excel(name = "项目负责人", width = 15)
+    @ApiModelProperty(value = "项目负责人")
+    private String principalName;
 }

jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java

@@ -25,7 +25,13 @@ public class CompanyComeMoneyDetail {
 
     @ApiModelProperty(value = "来款用途编码")
     private String chargeUse;
+
+    @Excel(name = "打包")
+    @ApiModelProperty(value = "打包")
+    private String pack;
+
     @Excel(name = "来款用途")
     @ApiModelProperty(value = "来款用途")
     private String chargeUse_text;
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java

@@ -14,6 +14,9 @@ public class PrincipalPeopleDetail {
 
     @ApiModelProperty(value = "项目id")
     private String id;
+    @Excel(name = "来款企业", width = 15)
+    @ApiModelProperty(value = "来款企业")
+    private String chargeCompanyTemporaryName;
     @Excel(name = "来款项目", width = 15)
     @ApiModelProperty(value = "来款项目")
     private String projectName;
@@ -23,6 +26,9 @@ public class PrincipalPeopleDetail {
     @Excel(name = "实收总金额", width = 15)
     @ApiModelProperty(value = "实收总金额")
     private String comeAllMoney;
+    @Excel(name = "打包", width = 15)
+    @ApiModelProperty(value = "打包")
+    private String pack;
     @ApiModelProperty(value = "来款用途编码")
     private String chargeUse;
     @Excel(name = "来款用途", width = 15)