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

注释不需要内容

Browse Source
This commit is contained in:
zhangqinlin
2021-10-09 15:57:24 +08:00
parent 98ebd3dd75
commit 8e3ca9d2cc
16 changed files with 189 additions and 53 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
+1 -1
View File
@@ -157,7 +157,7 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
payCaseCommitteeService.save(payCaseCommittee);
return Result.OK("添加成功！");
}else {
return Result.error("分标委表名已存在");
return Result.error("分标委名已存在");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+7 -1
View File
@@ -24,9 +24,11 @@ import com.jero.meeting.entity.PayMeetingRemindRecord;
import com.jero.meeting.service.IPayMeetingRemindRecordService;
import com.jero.project.common.PayProjectCommon;
import com.jero.util.AmountUtil;
import com.jero.util.SearchUtil;
import io.swagger.annotations.ApiImplicitParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,9 +74,13 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
) {
//模糊查询%_特殊字符bug
String contactsName2 = SearchUtil.exchenge(contactsName);
String companyName2 = SearchUtil.exchenge(companyName);
String fenBiaoWeiName2 = SearchUtil.exchenge(fenBiaoWeiName);
Page<FindByName> page = new Page<>(pageNo, pageSize);
IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(page,contactsName,companyName,fenBiaoWeiName);
IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(page,contactsName2,companyName2,fenBiaoWeiName2);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeDTO.java
+2 -2
View File
@@ -11,11 +11,11 @@ import javax.validation.constraints.Size;
public class PayCaseCommitteeDTO {
@NotBlank(message = "分标委名称不能为空")
@Size(max = 20,message = "分标委名称长度不能超过20")
@Size(max = 50,message = "分标委名称长度不能超过50")
@ApiModelProperty(value = "分标委名称")
private java.lang.String name;
@Size(max = 100,message = "备注长度不得超过100")
@Size(max = 200,message = "备注长度不得超过200")
@ApiModelProperty(value = "备注")
private java.lang.String remarks;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+9 -7
View File
@@ -21,13 +21,13 @@
left join pay_company_management pcm on(pm.company_id=pcm.id)
<where>
<if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%')
AND pt.name LIKE CONCAT('%',#{name},'%') escape '/'
</if>
<if test=" companyName!=null and companyName != ''">
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') escape '/'
</if>
<if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%') escape '/'
</if>
</where>
group by pe.id
@@ -41,10 +41,10 @@
<where>
pm.committee_id = #{pid}
<if test=" companyName!=null and companyName != ''">
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') escape '/'
</if>
<if test=" tname!=null and tname != ''">
AND pt.name LIKE CONCAT('%',#{tname},'%')
AND pt.name LIKE CONCAT('%',#{tname},'%') escape '/'
</if>
</where>
order by pm.create_time desc
@@ -52,11 +52,12 @@
<select id="listForExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
SELECT pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name
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
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)
left join pay_company_management pcm on(pm.company_id=pcm.id)
<where>
<if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%')
@@ -112,11 +113,12 @@
</select>
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
SELECT pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name
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
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)
left join pay_company_management pcm on(pm.company_id=pcm.id)
<where>
<if test="idList !=null and idList != ''">
pm.id in
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+6 -7
View File
@@ -39,6 +39,7 @@ import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayCommonProjectService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.util.AmountUtil;
import com.jero.util.SearchUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -69,10 +70,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Autowired
private IPayMailBillService payMailBillService;
@Autowired
private ProjectDetailService projectDetailService;
@Autowired
private IPayMailBillProjectService iPayMailBillProjectService;
@Autowired
private IPayCommonProjectService payCommonProjectService;
@Autowired
private IPayMemberProjectSubitemService payMemberProjectSubitemService;
@@ -124,13 +121,15 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
queryWrapper.le("send_date", calendar.getTime());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName());
//queryWrapper.apply("charge_company_name"+"like{0}"+"{1}","%"+SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName())+"%","escape '/'");
queryWrapper.like("charge_company_name", SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){
queryWrapper.like("principal_id",payMailBillSearch.getPrincipalId());
queryWrapper.eq("principal_id",payMailBillSearch.getPrincipalId());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
queryWrapper.like("project_name",payMailBillSearch.getProjectName());
//queryWrapper.apply("project_name"+" like{0}" +"{1}","%"+SearchUtil.exchenge(payMailBillSearch.getProjectName())+"%"+"escape '/'");
queryWrapper.like("project_name",SearchUtil.exchenge(payMailBillSearch.getProjectName()));
}
IPage<PayMailBill> pageList = payMailBillService.pageList(page, queryWrapper);
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java
+5
View File
@@ -11,6 +11,7 @@ import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import org.apache.ibatis.annotations.Param;
import java.util.ArrayList;
import java.util.List;
/**
@@ -55,4 +56,8 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroup
* @Exception
*/
IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listNeedInvoice") List<Integer> listNeedInvoice,@Param("listProjectIds") List<String> listProjectIds);
IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listProjectIds") List<String> listProjectIds);
List<PayWorkGroupSubletStatistics> importExcelStatistics2(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,@Param("id") String id,@Param("selections") ArrayList<String> selections);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml
+1 -1
View File
@@ -38,7 +38,7 @@
left join oss_file ossf on (pht.fileId=ossf.id)) ail
<where>
<if test="fileName!=null and fileName!=''">
ail.fileName like concat(%,concat(%,#{fileName},%),%)
ail.fileName like concat('%',concat(#{fileName},'%'))
</if>
</where>
order by ail.uploadTime desc
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+15 -15
View File
@@ -199,7 +199,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pwgs.in_account LIKE
@@ -213,7 +213,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pwgs.charge_company_temporary_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pwg.principal_id_a=#{allProjectStatisticsSearch.principalNameId}
@@ -258,7 +258,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pcp.charge_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pcp.in_account LIKE
@@ -266,7 +266,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pcp.charge_company_temporary_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.departCode != null and allProjectStatisticsSearch.departCode != ''">
AND su.org_code =#{allProjectStatisticsSearch.departCode}
@@ -318,7 +318,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pmps.in_account LIKE
@@ -332,7 +332,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pmps.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pmp.director_id=#{allProjectStatisticsSearch.principalNameId}
@@ -377,7 +377,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pm.meeting_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pms.in_account LIKE
@@ -391,7 +391,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pms.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pm.director_id=#{allProjectStatisticsSearch.principalNameId}
@@ -434,7 +434,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND tmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND tmps.in_account LIKE
@@ -451,7 +451,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND tmps.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
AND tmps.pack=#{allProjectStatisticsSearch.pack}
@@ -1303,7 +1303,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pwgs.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1345,7 +1345,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pcp.charge_project LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pcp.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1387,7 +1387,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pm.meeting_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pms.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1429,7 +1429,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pmp.project_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1464,7 +1464,7 @@
<where>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND tmp.project_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+62
View File
@@ -127,6 +127,68 @@
GROUP BY pwg.principal_id_a) pwg2 on (pwg2.principalId=pwg1.principalId)
order by pwg1.create_time
</select>
<!-- 工作组详情导出 -->
<select id="importExcelStatistics2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
select * from (SELECT
pwgs.id,
pwg.principal_id_a as principalId,
pwg.principal_name_a as principalName,
pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,
pwgs.receivable_amount AS allMoney,
pwgs.paid_amount AS comeAllMoney,
pwgs.charge_use as chargeUse,
pwgs.create_time
FROM pay_working_group_subitem pwgs
left join pay_working_group pwg on(pwgs.working_group_id=pwg.id)
<where>
pwgs.working_group_id = #{id} and pwgs.id in
<foreach collection="selections" open="(" separator="," close=")" item="item" index="index">
#{item}
</foreach>
<if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
</if>
<if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse}
</if>
<if test="payWorkingGroupSubletSearch.chargeCompanyTemporaryName != null and payWorkingGroupSubletSearch.chargeCompanyTemporaryName != ''">
AND pwgs.charge_company_temporary_name LIKE
concat('%',concat(#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%'))
</if>
<if test="payWorkingGroupSubletSearch.inAccountStatue != null and payWorkingGroupSubletSearch.inAccountStatue != ''">
AND pwgs.in_account= #{payWorkingGroupSubletSearch.inAccountStatue}
</if>
<if test="payWorkingGroupSubletSearch.principalNameId != null and payWorkingGroupSubletSearch.principalNameId != ''">
AND pwg.principal_id_a=#{payWorkingGroupSubletSearch.principalNameId}
</if>
<choose>
<when test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != '' and payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney} and if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
</when>
<otherwise>
<if test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != ''">
AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney}
</if>
<if test="payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
</where>
group by pwgs.id) pwg1
inner join
(SELECT
pwg.principal_id_a as principalId
FROM pay_working_group pwg
inner JOIN (select pwgs.id as id,working_group_id
from pay_working_group_subitem pwgs
left join pay_payment_record ppr on(pwgs.id=ppr.project_id)
WHERE ppr.payment_date like concat('%',#{payWorkingGroupSubletSearch.year},'%') GROUP BY working_group_id) pwgss ON (pwg.id=pwgss.working_group_id)
GROUP BY pwg.principal_id_a) pwg2 on (pwg2.principalId=pwg1.principalId)
order by pwg1.create_time
</select>
<select id="queryCompanyPageList" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
select pwgs.*,pwg.working_group_project as chargeProject from pay_working_group_subitem pwgs
left join pay_working_group pwg ON pwgs.working_group_id = pwg.id
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java
+2
View File
@@ -11,6 +11,7 @@ import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
/**
@@ -108,4 +109,5 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
*/
IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,PayWorkingGroupSubItem payWorkingGroupSubItem,List<Integer> listNeedInvoice,List<String> listProjectIds);
List<PayWorkGroupSubletStatistics> importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList<String> selections);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+5
View File
@@ -553,6 +553,11 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
return payWorkingGroupSubItemMapper.queryCompanyPageList( page, payWorkingGroupSubItem,listNeedInvoice, listProjectIds);
}
@Override
public List<PayWorkGroupSubletStatistics> importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList<String> selections) {
return payWorkingGroupSubItemMapper.importExcelStatistics2(payWorkingGroupSubletSearch,id,selections);
}
/**
* @Description 删除项目打包关联，临时企业、联系信息
* @Author lqt
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+11 -1
View File
@@ -26,6 +26,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import com.jero.util.AmountUtil;
import com.jero.util.SearchUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -65,10 +67,12 @@ public class AllProjectStatisticsController {
*/
@ApiOperation(value = "全所统计搜索-分页列表查询", notes = "全所统计搜索-详情分页列表查询")
@GetMapping(value = "/list")
public Result<?> list(AllProjectStatisticsSearch allProjectStatisticsSearch,
public Result<?> list(@Valid AllProjectStatisticsSearch allProjectStatisticsSearch,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
allProjectStatisticsSearch.setProjectName( SearchUtil.exchenge(allProjectStatisticsSearch.getProjectName()));
allProjectStatisticsSearch.setChargeCompanyTemporaryName( SearchUtil.exchenge(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
//根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -144,6 +148,8 @@ public class AllProjectStatisticsController {
public Result<?> listProject(AllProjectStatisticsSearch allProjectStatisticsSearch,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
allProjectStatisticsSearch.setProjectName( SearchUtil.exchenge(allProjectStatisticsSearch.getProjectName()));
allProjectStatisticsSearch.setChargeCompanyTemporaryName( SearchUtil.exchenge(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
//根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
@@ -213,6 +219,8 @@ public class AllProjectStatisticsController {
@GetMapping(value = "/statistics/excel")
@ApiOperation(value = "全所统计导出-导出统计", notes = "全所统计导出-导出统计")
public ModelAndView excel( AllProjectStatisticsSearch allProjectStatisticsSearch) {
allProjectStatisticsSearch.setProjectName( SearchUtil.exchenge(allProjectStatisticsSearch.getProjectName()));
allProjectStatisticsSearch.setChargeCompanyTemporaryName( SearchUtil.exchenge(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
//根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
@@ -260,6 +268,8 @@ public class AllProjectStatisticsController {
@GetMapping(value = "/statistics/excelProject")
@ApiOperation(value = "企业项目统计-导出统计", notes = "企业项目统计-导出统计")
public ModelAndView excelProject( AllProjectStatisticsSearch allProjectStatisticsSearch) {
allProjectStatisticsSearch.setProjectName( SearchUtil.exchenge(allProjectStatisticsSearch.getProjectName()));
allProjectStatisticsSearch.setChargeCompanyTemporaryName( SearchUtil.exchenge(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+4
View File
@@ -14,6 +14,7 @@ import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.statistics.entity.*;
import com.jero.util.AmountUtil;
import com.jero.util.SearchUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -60,6 +61,8 @@ public class CompanyComeMoneyStatisticsController {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
if (companyComeMoneySearch.getYear() == null || companyComeMoneySearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -127,6 +130,7 @@ public class CompanyComeMoneyStatisticsController {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
companyComeMoneyDetailSearch.setProjectName( SearchUtil.exchenge(companyComeMoneyDetailSearch.getProjectName()));
if (companyComeMoneyDetailSearch.getYear() == null || companyComeMoneyDetailSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+39 -16
View File
@@ -20,6 +20,7 @@ import com.jero.project.entity.PayWorkingGroupSubletSearch;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.util.AmountUtil;
import com.jero.util.SearchUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -69,7 +70,7 @@ public class PayWorkingGroupStatisticsController {
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
payWorkingGroupSearch.setWorkGroup(SearchUtil.exchenge(payWorkingGroupSearch.getWorkGroup()));
Page<PayWorkingGroupStatistics> page = new Page<>(pageNo, pageSize);
if(payWorkingGroupSearch.getYear()==null|| payWorkingGroupSearch.getYear().equals("")){
Calendar calendar= Calendar.getInstance();
@@ -140,6 +141,7 @@ public class PayWorkingGroupStatisticsController {
@GetMapping(value = "/exportXls2")
@ApiOperation(value="工作组项目统计-统计导出excel", notes="工作组项目统计-统计导出excel")
public ModelAndView exportXls2( PayWorkingGroupSearch payWorkingGroupSearch) {
payWorkingGroupSearch.setWorkGroup(SearchUtil.exchenge(payWorkingGroupSearch.getWorkGroup()));
if(payWorkingGroupSearch.getYear()==null|| payWorkingGroupSearch.getYear().equals("")){
Calendar calendar= Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -199,6 +201,8 @@ public class PayWorkingGroupStatisticsController {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "id") String id,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(SearchUtil.exchenge(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
Page<PayWorkGroupSubletStatistics> page = new Page<>(pageNo, pageSize);
if(payWorkingGroupSubletSearch.getYear()==null|| payWorkingGroupSubletSearch.getYear().equals("")){
Calendar calendar= Calendar.getInstance();
@@ -246,25 +250,44 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
@ApiImplicitParam(name = "id", value = "工作组id", dataType = "String", required = true)
public ModelAndView excelSub(
PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,
@RequestParam(name = "id", required = true) String id) {
if(payWorkingGroupSubletSearch.getYear()==null|| payWorkingGroupSubletSearch.getYear().equals("")){
Calendar calendar= Calendar.getInstance();
@RequestParam(name = "id", required = true) String id,
@RequestParam(name = "selections", required = false) String selections
) {
if (payWorkingGroupSubletSearch.getYear() == null || payWorkingGroupSubletSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
payWorkingGroupSubletSearch.setYear(year);
}
List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch,id);
//处理为空数据为0
for(PayWorkGroupSubletStatistics s: pageList){
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
if (ObjectUtils.isEmpty(selections)) {
payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(SearchUtil.exchenge(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch, id);
//处理为空数据为0
for (PayWorkGroupSubletStatistics s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
}
}
return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
} else {
payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(SearchUtil.exchenge(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
ArrayList<String> selections2 = new ArrayList<>(Arrays.asList(selections.split(",")));
List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics2(payWorkingGroupSubletSearch,id,selections2);
//处理为空数据为0
for (PayWorkGroupSubletStatistics s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
s.setAllMoney("0.00");
}
if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
s.setComeAllMoney("0.00");
}
}
return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
}
return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java
+1 -2
View File
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.Digits;
import java.math.BigDecimal;
/**
@@ -20,11 +21,9 @@ public class AllProjectStatisticsSearch {
@ApiModelProperty(value = "来款单位")
private String chargeCompanyTemporaryName;
@ApiModelProperty(value = "应收总金额")
private String allMoney;
@ApiModelProperty(value = "应收总金额范围")
private String allMoneyTwo;
jero-boot-incoming-payment/src/main/java/com/jero/util/SearchUtil.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.util;
import org.apache.commons.lang3.ObjectUtils;
/**
* @author zql
* @date 2021/10/9 10:46
*/
public class SearchUtil {
public static String exchenge(String string){
if(!ObjectUtils.isEmpty(string)){
string = string.replaceAll("/", "//") ;
string = string.replaceAll("_", "/_") ;
string = string.replaceAll("%", "/%") ;
}
return string;
}
}