LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/branch20211008' into branch20211008

Browse Source
This commit is contained in:
梁琦涛
2021-10-15 11:43:16 +08:00
parent a61aab6e09 e8b7ba5ee5
commit c5c31fa8bb
14 changed files with 57 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
-48
View File
@@ -212,52 +212,4 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
}
// /**
// * 批量删除
// *
// * @param ids
// * @return
// */
// @AutoLog(value = "分标委表-批量删除")
// @ApiOperation(value="分标委表-批量删除", notes="分标委表-批量删除")
// @GetMapping(value = "/deleteBatch")
// public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
// this.payCaseCommitteeService.removeByIds(Arrays.asList(ids.split(",")));
// return Result.OK("批量删除成功!");
// }
// /**
// * 通过id查询
// *
// * @param id
// * @return
// */
// @AutoLog(value = "分标委表-通过id查询")
// @ApiOperation(value="分标委表-通过id查询", notes="分标委表-通过id查询")
// @GetMapping(value = "/queryById")
// public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
// PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(id);
// if(payCaseCommittee==null) {
// return Result.error("未找到对应数据");
// }
// return Result.OK(payCaseCommittee);
// }
//
// /**
// * 通过excel导入数据
// *
// * @param request
// * @param response
// * @return
// */
// @AutoLog(value = "分标委表-通过id删除")
// @ApiOperation(value="分标委表-通过id删除", notes="分标委表-通过id删除")
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
// public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
// return super.importExcel(request, response, PayCaseCommittee.class);
// }
}
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+7 -78
View File
@@ -76,12 +76,12 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
) {
//模糊查询%_特殊字符bug
String contactsName2 = SearchUtil.exchenge(contactsName);
String companyName2 = SearchUtil.exchenge(companyName);
String fenBiaoWeiName2 = SearchUtil.exchenge(fenBiaoWeiName);
String contactsNames = SearchUtil.exchenge(contactsName);
String companyNames = SearchUtil.exchenge(companyName);
String fenBiaoWeiNames = SearchUtil.exchenge(fenBiaoWeiName);
Page<FindByName> page = new Page<>(pageNo, pageSize);
IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(page,contactsName2,companyName2,fenBiaoWeiName2);
IPage<FindByName> pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
@@ -115,7 +115,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
if (StringUtils.isNotBlank(companyName)){
queryWrapper.like("pm.company_name",companyName);
}
List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemService.list2(queryWrapper);
List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemService.listTwo(queryWrapper);
if (!CollectionUtils.isEmpty(list)) {
try {
list.forEach(p -> {
@@ -184,23 +184,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
return AmountUtil.exportListXls(list, ChooseExcelWorkingGroup.class,"分标委表导出");
}
/**
* 校验
*/
@AutoLog(value = "分标委成员表-新增时校验重复")
@ApiOperation(value="分标委成员表-新增时校验重复", notes="分标委成员表-新增时校验重复")
@ApiImplicitParam(name = "id", value = "联系人主键", dataType = "String", required = true)
@GetMapping(value = "/voiled")
public Result<?> voiled(@RequestParam(name="id",required = true) String id) {
LambdaQueryWrapper<PayCaseCommitteeSubitem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PayCaseCommitteeSubitem::getContactsId, id);
List<PayCaseCommitteeSubitem> list = payCaseCommitteeSubitemService.list(lambdaQueryWrapper);
if (list.size() > 0) {
return Result.error("联系人重复，请重新选择");
} else {
return Result.OK();
}
}
/**
* 添加
@@ -216,6 +200,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
// 新增时校验重复
LambdaQueryWrapper<PayCaseCommitteeSubitem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PayCaseCommitteeSubitem::getContactsId, payCaseCommitteeSubitemDTO.getContactsId());
lambdaQueryWrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payCaseCommitteeSubitemDTO.getCommitteeId());
List<PayCaseCommitteeSubitem> list = payCaseCommitteeSubitemService.list(lambdaQueryWrapper);
if (list.size() > 0) {
return Result.error("联系人重复，请重新选择");
@@ -252,60 +237,4 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
return Result.OK("批量删除成功!");
}
// /**
// * 编辑
// * @param payCaseCommitteeSubitemUpdateDTO
// * @return
// */
// @AutoLog(value = "分标委成员表-编辑")
// @ApiOperation(value="分标委成员表-编辑", notes="分标委成员表-编辑")
// @PostMapping(value = "/edit")
// public Result<?> edit(@RequestBody PayCaseCommitteeSubitemUpdateDTO payCaseCommitteeSubitemUpdateDTO) {
// PayCaseCommitteeSubitem payCaseCommitteeSubitem = new PayCaseCommitteeSubitem();
// BeanUtils.copyProperties(payCaseCommitteeSubitemUpdateDTO,payCaseCommitteeSubitem);
// payCaseCommitteeSubitemService.updateById(payCaseCommitteeSubitem);
// return Result.OK("编辑成功!");
// }
//
// /**
// * 通过id查询
// *
// * @param id
// * @return
// */
// @AutoLog(value = "分标委成员表-通过id查询")
// @ApiOperation(value="分标委成员表-通过id查询", notes="分标委成员表-通过id查询")
// @GetMapping(value = "/queryById")
// public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
// PayCaseCommitteeSubitem payCaseCommitteeSubitem = payCaseCommitteeSubitemService.getById(id);
// if(payCaseCommitteeSubitem==null) {
// return Result.error("未找到对应数据");
// }
// return Result.OK(payCaseCommitteeSubitem);
// }
// /**
// * 导出excel
// * @param request
// * @param payCaseCommitteeSubitem
// */
// @RequestMapping(value = "/exportXls")
// public ModelAndView exportXls(HttpServletRequest request, PayCaseCommitteeSubitem payCaseCommitteeSubitem) {
// return super.exportXls(request, payCaseCommitteeSubitem, PayCaseCommitteeSubitem.class, "分标委成员表");
// }
//
// /**
// * 通过excel导入数据
// *
// * @param request
// * @param response
// * @return
// */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
// public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
// return super.importExcel(request, response, PayCaseCommitteeSubitem.class);
// }
//
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
+2 -5
View File
@@ -23,13 +23,10 @@ import java.util.List;
*/
public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
IPage<FindByName> list3 (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName);
IPage<FindByName> listThree (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName);
List<payCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
List<payCaseCommitteeSubitemVO> listTwo (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
List<PayCaseCommitteeExcel> listExcel(@Param(Constants.WRAPPER) QueryWrapper<PayCaseCommitteeExcel> queryWrapper);
List<FindByName> list4(@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param(Constants.WRAPPER) Wrapper<PayCaseCommittee> wrapper);
List<ChooseExcelWorkingGroup> listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName);
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+2 -31
View File
@@ -12,7 +12,7 @@
<result property="peopleName" column="peopleName"></result>
</collection>
</resultMap>
<select id="list3" resultMap="people">
<select id="listThree" resultMap="people">
SELECT pe.id as id,pe.name as name,pe.remarks,#{companyName} as companyName,#{name} as tname
from
pay_case_committee pe
@@ -73,28 +73,7 @@
</select>
<select id="list4" resultMap="people">
SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId
from
pay_case_committee pe
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
<where>
<if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%')
</if>
<if test=" companyName!=null and companyName != ''">
AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
</if>
<if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if>
</where>
group by pe.id
</select>
<select id="list2" resultType="com.jero.data.entity.VO.payCaseCommitteeSubitemVO">
<select id="listTwo" resultType="com.jero.data.entity.VO.payCaseCommitteeSubitemVO">
SELECT pm.id as id,pt.id as contactId, pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as phoneNamber,pt.email
from
pay_case_committee pe
@@ -103,14 +82,6 @@
${ew.customSqlSegment}
</select>
<select id="listExcel" resultType="com.jero.data.entity.PayCaseCommitteeExcel">
SELECT pe.name as name,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone
from
pay_case_committee pe
right JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
${ew.customSqlSegment}
</select>
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
+2 -6
View File
@@ -23,13 +23,9 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
List<PayCaseCommitteeSubitem> selectList(LambdaQueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
List<PayCaseCommitteeExcel> listExcel(QueryWrapper<PayCaseCommitteeExcel> queryWrapper);
List<payCaseCommitteeSubitemVO> listTwo(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
List<payCaseCommitteeSubitemVO> list2(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
IPage<FindByName> list3(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName);
List<FindByName> list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper);
IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName);
List<ChooseExcelWorkingGroup> listForExcel(String name, String companyName, String fenBiaoWeiName);
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+5 -13
View File
@@ -34,25 +34,17 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
return payCaseCommitteeSubitemMapper.selectList(queryWrapper);
}
@Override
public List<PayCaseCommitteeExcel> listExcel(QueryWrapper<PayCaseCommitteeExcel> queryWrapper) {
return payCaseCommitteeSubitemMapper.listExcel(queryWrapper);
public List<payCaseCommitteeSubitemVO> listTwo(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
return payCaseCommitteeSubitemMapper.listTwo(queryWrapper);
}
@Override
public List<payCaseCommitteeSubitemVO> list2(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
return payCaseCommitteeSubitemMapper.list2(queryWrapper);
public IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName) {
return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName);
}
@Override
public IPage<FindByName> list3(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName) {
return payCaseCommitteeSubitemMapper.list3(page,name,companyName,fenBiaoWeiName);
}
@Override
public List<FindByName> list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper) {
return payCaseCommitteeSubitemMapper.list4(pageNo,pageSize,name,companyName,fenBiaoWeiName, queryWrapper);
}
@Override
public List<ChooseExcelWorkingGroup> listForExcel(String name, String companyName, String fenBiaoWeiName) {
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+3 -51
View File
@@ -84,51 +84,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Resource
private SendMessageService sendMessageService;
// /**
// * 分页列表查询
// *
// * @param payMailBillSearch
// * @param pageNo
// * @param pageSize
// * @param
// * @return
// */
// @ApiOperation(value="邮寄票据-分页列表查询", notes="邮寄票据-分页列表查询")
// @GetMapping(value = "/list")
// public Result<?> queryPageList( PayMailBillSearch payMailBillSearch,
// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
// ) {
//// QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
// Page<PayMailBill> page = new Page<>(pageNo, pageSize);
// if(ObjectUtils.isNotEmpty(payMailBillSearch.getEndTime())) {
// Calendar calendar = Calendar.getInstance();
// calendar.setTime(payMailBillSearch.getEndTime());
// calendar.add(Calendar.HOUR, 23);//时
// calendar.add(Calendar.MINUTE, 59);//时
// calendar.add(Calendar.SECOND, 59);//秒
// payMailBillSearch.setEndTime(calendar.getTime());
// }
// if(ObjectUtils.isNotEmpty(payMailBillSearch.getChargeCompanyName())) {
// payMailBillSearch.setChargeCompanyName(SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
// }
// if(ObjectUtils.isNotEmpty(payMailBillSearch.getProjectName())) {
// payMailBillSearch.setProjectName(SearchUtil.exchenge(payMailBillSearch.getProjectName()));
// }
// IPage<PayMailBill> pageList = payMailBillService.pageLists(page, payMailBillSearch);
// if (!CollectionUtils.isEmpty(pageList.getRecords())) {
// try {
// pageList.getRecords().forEach(p -> {
// if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
// p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
// }
// });
// } catch (Exception e) {
// log.error("手机号解密异常！", e);
// }
// }
// return Result.OK(pageList);
// }
/**
* 分页列表查询
@@ -228,9 +183,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject,false);
if(ObjectUtils.isNotEmpty(one)){
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
queryPayMailBillProject2.eq(PayMailBillProject::getProjectId,one.getProjectId());
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject2);
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProjectTwo = new LambdaQueryWrapper<>();
queryPayMailBillProjectTwo.eq(PayMailBillProject::getProjectId,one.getProjectId());
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProjectTwo);
// 开票金额
BigDecimal invoice = new BigDecimal("0.00");
@@ -413,9 +368,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
// Date day=new Date();
// SimpleDateFormat df = new SimpleDateFormat("yyyy年MM月dd日HH时mm分ss秒");
// return super.exportXls(request, payMailBill, PayMailBill.class, df.format(day).toString()+"邮寄票据信息");
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
-44
View File
@@ -154,50 +154,6 @@ public class PayMailContractController extends JeroController<PayMailContract, I
return Result.OK("操作成功!");
}
// /**
// * 通过id删除
// *
// * @param id
// * @return
// */
// @AutoLog(value = "邮寄合同-通过id删除")
// @ApiOperation(value="邮寄合同-通过id删除", notes="邮寄合同-通过id删除")
// @DeleteMapping(value = "/delete")
// public Result<?> delete(@RequestParam(name="id",required=true) String id) {
// payMailContractService.removeById(id);
// return Result.OK("删除成功!");
// }
//
// /**
// * 批量删除
// *
// * @param ids
// * @return
// */
// @AutoLog(value = "邮寄合同-批量删除")
// @ApiOperation(value="邮寄合同-批量删除", notes="邮寄合同-批量删除")
// @DeleteMapping(value = "/deleteBatch")
// public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
// this.payMailContractService.removeByIds(Arrays.asList(ids.split(",")));
// return Result.OK("批量删除成功!");
// }
//
// /**
// * 通过id查询
// *
// * @param id
// * @return
// */
// @AutoLog(value = "邮寄合同-通过id查询")
// @ApiOperation(value="邮寄合同-通过id查询", notes="邮寄合同-通过id查询")
// @GetMapping(value = "/queryById")
// public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
// PayMailContract payMailContract = payMailContractService.getById(id);
// if(payMailContract==null) {
// return Result.error("未找到对应数据");
// }
// return Result.OK(payMailContract);
// }
/**
* 导出excel
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+1 -1
View File
@@ -98,7 +98,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
/**
* 全所查询
*/
IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page , AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList );
IPage<AllProjectStatistics> queryPageList(Page<AllProjectStatistics> page , AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList );
/**
* 全所查询导出
*/
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+2 -2
View File
@@ -203,8 +203,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
* @return
*/
@Override
public IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page ,AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList ) {
return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch, idList );
public IPage<AllProjectStatistics> queryPageList(Page<AllProjectStatistics> page ,AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList ) {
return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch,idList);
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+9 -9
View File
@@ -104,15 +104,15 @@ public class AllProjectStatisticsController {
allProjectStatisticsSearch.setYear(year);
}
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList3(page,allProjectStatisticsSearch, idList );
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList );
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
if (pageList.getRecords() != null) {
for(AllProjectStatistics s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
@@ -131,7 +131,7 @@ public class AllProjectStatisticsController {
}
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -183,12 +183,12 @@ public class AllProjectStatisticsController {
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
if (pageList.getRecords() != null) {
for(AllProjectStatistics s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
@@ -207,7 +207,7 @@ public class AllProjectStatisticsController {
}
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+8 -8
View File
@@ -95,10 +95,10 @@ public class CompanyComeMoneyStatisticsController {
IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
//处理为空数据为0
for(CompanyComeMoneyList s: pageList.getRecords()){
@@ -110,9 +110,9 @@ public class CompanyComeMoneyStatisticsController {
}
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -164,12 +164,12 @@ public class CompanyComeMoneyStatisticsController {
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
for(CompanyComeMoneyDetail s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
@@ -185,7 +185,7 @@ public class CompanyComeMoneyStatisticsController {
}
}
hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
hashMap.put("sumOfReallyMoney", sum2 == 0.0 ? sum2 : df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
hashMap.put("pageList", pageList);
return Result.OK(hashMap);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+8 -8
View File
@@ -110,10 +110,10 @@ public class PayWorkingGroupStatisticsController {
//计算应收和实收总金额
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = records.stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0.00" : t.getAllMoney())).sum();
sum2 = records.stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.00" : t.getComeAllMoney())).sum();
sumTwo = records.stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.00" : t.getComeAllMoney())).sum();
}
//处理为空数据为0
for(PayWorkingGroupStatistics s: pageList.getRecords()){
@@ -128,10 +128,10 @@ public class PayWorkingGroupStatisticsController {
}
}
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
objectObjectHashMap.put("pageList",pageList.setRecords(records));
objectObjectHashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
objectObjectHashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
objectObjectHashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
return Result.OK(objectObjectHashMap);
}
@@ -215,13 +215,13 @@ public class PayWorkingGroupStatisticsController {
}
IPage<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch,id);
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0.0" : t.getAllMoney())).sum();
sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.0" : t.getComeAllMoney())).sum();
sumTwo = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.0" : t.getComeAllMoney())).sum();
}
HashMap<String, Object> hashMap = new HashMap<>();
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
// 转义来款用途
for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
@@ -239,7 +239,7 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
hashMap.put("pageList",pageList);
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
return Result.OK(hashMap);
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+8 -8
View File
@@ -97,10 +97,10 @@ public class PrincipalPeopleStatisticsController {
IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
//处理为空数据为0
for(PrincipalPeopleList s: Objects.requireNonNull(pageList.getRecords())) {
@@ -114,9 +114,9 @@ public class PrincipalPeopleStatisticsController {
s.setFinishRate("0.00%");
}
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
@@ -145,12 +145,12 @@ public class PrincipalPeopleStatisticsController {
IPage<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sum2 =0;
double sumTwo =0;
if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
}
DecimalFormat df = new DecimalFormat("#.00");
DecimalFormat df = new DecimalFormat("#,##0.00");
for(PrincipalPeopleDetail s: pageList.getRecords()){
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
@@ -167,7 +167,7 @@ public class PrincipalPeopleStatisticsController {
}
hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
hashMap.put("sumOfReallyMoney", sum2 == 0.0 ? sum2 : df.format(sum2));
hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
hashMap.put("pageList", pageList);
return Result.OK(hashMap);