add:合同变更

2022-04-01 18:09:41 +08:00
parent 1ce08f3600
commit a8db9f916b
20 changed files with 982 additions and 109 deletions
@@ -131,5 +131,13 @@ public class PayIncomeContractCommon {
     * 合同类型（1为支出合同，否侧为收入合同）
     */
    public final static Integer CONTRACT_TYPE = 2;
+    /**
+     * 合同类型（1为支出合同，否侧为收入合同）
+     */
+    public final static Integer CONTRACT_TYPE1 = 1;
+    /**
+     * 合同类型（1为支出合同，否侧为收入合同）
+     */
+    public final static Integer CONTRACT_TYPE2 = 2;

 }
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
+import com.jero.common.util.superSearch.ConstantUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -77,6 +78,15 @@ public class PaySpendingContract implements Serializable {
    @Size(max = 50, message = "签订联系人长度不能大于50个字符")
    @NotEmpty(message = "签订联系人不能为空")
    private String signedContactsTemporaryName;
+
+    @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "联系人手机号码格式错误")
+    @NotEmpty(message = "联系人电话不能为空")
+    private String phone;
+    @NotEmpty(message = "联系人地址不能为空")
+    private String address;
+    @NotEmpty(message = "联系人邮编不能为空")
+    private String postCode;
+
 	/**是否开口（1：是，0：否）*/
 	@Excel(name = "是否开口（1：是，0：否）", width = 15)
    @ApiModelProperty(value = "是否开口（1：是，0：否）")
@@ -184,10 +184,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
        if(!Objects.isNull(payContactsManagementTemporary)){
            payMailContract.setMobile(payContactsManagementTemporary.getPhone());
            payMailContract.setEmail(payContactsManagementTemporary.getEmail());
+            payMailContract.setLiaisonMan(payContactsManagementTemporary.getName());
        }
        payMailContract.setContractId(payIncomeContract.getId());
        payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
-        payMailContract.setLiaisonMan(payIncomeContract.getContractName());
+        payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE2);
        payMailContractService.save(payMailContract);

        // 校验金额
@@ -133,6 +133,16 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
        paySpendingContract.setPrincipalId(principalName.getId());
        paySpendingContract.setPrincipalName(principalName.getRealname());
        paySpendingContractService.save(paySpendingContract);
+        // 更新到合同邮寄表
+        PayMailContract payMailContract = new PayMailContract();
+        payMailContract.setContractId(paySpendingContract.getId());
+        payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
+        payMailContract.setMobile(paySpendingContract.getPhone());
+        payMailContract.setEmail("");
+        payMailContract.setLiaisonMan(paySpendingContract.getSignedContactsTemporaryName());
+        payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE1);
+        payMailContractService.save(payMailContract);
+
        StringBuilder msgPaySpendingContractInstallment = new StringBuilder();
        if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
            List<PaySpendingContractInstallment> finalListPaySpendingContractInstallment = listPaySpendingContractInstallment;
@@ -262,6 +272,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
            List<String> list = listPaySpendingContractInstallmentOld.stream().map(PaySpendingContractInstallment::getId).collect(Collectors.toList());
            paySpendingContractInstallmentService.removeByIds(list);
        }
+
        // 新增
        if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
            List<PaySpendingContractInstallment> finalListPaySpendingContractInstallment = listPaySpendingContractInstallment;
@@ -17,6 +17,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.oConvertUtils;
+import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.mail.entity.PayMailContracrList;
@@ -128,56 +129,57 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 		payMailContract.setMobile(PasswordUtil.encrypt(payMailContract.getMobile()));
 		payMailContract.setMailer(sysUser.getUsername());
 		payMailContractService.updateById(payMailContract);
+		if(payMailContract.getContractType()== PayIncomeContractCommon.CONTRACT_TYPE2) {
+			if (!Objects.isNull(payMailContractData)) {
+				PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
+				if (Objects.isNull(payIncomeContract)) {
+					throw new JeroBootException("合同不存在！");
+				}
+				// 发给 合同负责人
+				SysUser sysUserInfo = sysUserService.getById(payIncomeContract.getPrincipalId());
+				// 发送消息
+				SendMessageDTO sendMessageDTO = new SendMessageDTO();
+				if (!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())) {
+					sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail()));
+				}
+				if (!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())) {
+					sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone()));
+				}
+				HashMap<String, String> map = new HashMap<>();
+				map.put("contractName", payIncomeContract.getContractName());
+				map.put("contractNum", payIncomeContract.getContractNum());
+				sendMessageDTO.setFromUser(sysUser.getUsername());
+				sendMessageDTO.setToUser(sysUserInfo.getUsername());
+				sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG14.getCode());
+				sendMessageDTO.setTemplateParam(map);
+				sendMessageDTO.setBusType("M_OPEN_TYPE14");
+				JSONObject json = new JSONObject();
+				json.put("id", payMailContract.getPostNo());
+				sendMessageDTO.setBusId(json.toJSONString());
+				sendMessageService.SendMessageService(sendMessageDTO);

-		if (!Objects.isNull(payMailContractData)) {
-			PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
-			if(Objects.isNull(payIncomeContract)){
-				throw new JeroBootException("合同不存在！");
+				// 发给合同的签订单位合同联系人
+				SendMessageDTO sendMessageDTO1 = new SendMessageDTO();
+				if (!StringUtils.isBlank(payMailContractData.getEmail())) {
+					sendMessageDTO1.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail()));
+				}
+				if (!StringUtils.isBlank(payMailContractData.getMobile())) {
+					sendMessageDTO1.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile()));
+					sendMessageDTO1.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile()));
+				}
+				HashMap<String, String> map1 = new HashMap<>();
+				if (!Objects.isNull(payIncomeContract)) {
+					map1.put("contractName", payIncomeContract.getContractName());
+				}
+				sendMessageDTO1.setFromUser(sysUser.getUsername());
+				sendMessageDTO1.setTemplateCode(CompanyMessageEnums.MSG10.getCode());
+				sendMessageDTO1.setTemplateParam(map1);
+				JSONObject jsonObject = new JSONObject();
+				jsonObject.put("id", payMailContract.getPostNo());
+				sendMessageDTO1.setBusId(jsonObject.toJSONString());
+				sendMessageDTO1.setBusType("C_OPEN_TYPE10");
+				sendMessageService.SendMessageService(sendMessageDTO1);
 			}
-			// 发给 合同负责人
-			SysUser sysUserInfo = sysUserService.getById(payIncomeContract.getPrincipalId());
-			// 发送消息
-			SendMessageDTO sendMessageDTO = new SendMessageDTO();
-			if(!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())){
-				sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail()));
-			}
-			if(!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())){
-				sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone()));
-			}
-			HashMap<String,String> map = new HashMap<>();
-			map.put("contractName",payIncomeContract.getContractName());
-			map.put("contractNum",payIncomeContract.getContractNum());
-			sendMessageDTO.setFromUser(sysUser.getUsername());
-			sendMessageDTO.setToUser(sysUserInfo.getUsername());
-			sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG14.getCode());
-			sendMessageDTO.setTemplateParam(map);
-			sendMessageDTO.setBusType("M_OPEN_TYPE14");
-			JSONObject json = new JSONObject();
-			json.put("id",payMailContract.getPostNo());
-			sendMessageDTO.setBusId(json.toJSONString());
-			sendMessageService.SendMessageService(sendMessageDTO);
-
-			// 发给合同的签订单位合同联系人
-			SendMessageDTO sendMessageDTO1 = new SendMessageDTO();
-			if (!StringUtils.isBlank(payMailContractData.getEmail())) {
-				sendMessageDTO1.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail()));
-			}
-			if (!StringUtils.isBlank(payMailContractData.getMobile())) {
-				sendMessageDTO1.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile()));
-				sendMessageDTO1.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile()));
-			}
-			HashMap<String, String> map1 = new HashMap<>();
-			if (!Objects.isNull(payIncomeContract)) {
-				map1.put("contractName", payIncomeContract.getContractName());
-			}
-			sendMessageDTO1.setFromUser(sysUser.getUsername());
-			sendMessageDTO1.setTemplateCode(CompanyMessageEnums.MSG10.getCode());
-			sendMessageDTO1.setTemplateParam(map1);
-			JSONObject jsonObject = new JSONObject();
-			jsonObject.put("id",payMailContract.getPostNo());
-			sendMessageDTO1.setBusId(jsonObject.toJSONString());
-			sendMessageDTO1.setBusType("C_OPEN_TYPE10");
-			sendMessageService.SendMessageService(sendMessageDTO1);
 		}
 		return Result.OK("操作成功!");
 	 }
@@ -60,6 +60,10 @@ public class PayMailContracrList {
    private java.lang.String postalCode;
    @ApiModelProperty(value = "邮寄联系人地址")
    private java.lang.String contactAddress;
+    @Dict(dicCode ="contract_type")
+    @ApiModelProperty(value = "合同类型")
+    private java.lang.String contractType;
+



@@ -92,4 +92,6 @@ public class PayMailContract implements Serializable {
    @ApiModelProperty(value = "邮寄人(详情使用）")
    @TableField(exist = false)
    private String mailName;
+    @ApiModelProperty(value = "合同类型：1 支出合同，2 收入合同")
+    private Integer contractType;
 }
@@ -2,25 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.mail.mapper.PayMailContractMapper">
    <select id="pageContract"  resultType="com.jero.mail.entity.PayMailContracrList">
-SELECT
-pc.id,
-pc.post_status as postStatus,
-pc.send_method as sendMethod,
-pc.post_no as postNo,
-pc.liaison_man as liaisonMan,
-pc.mobile,
-pc.remark,
-pc.mailer,
-pc.send_date as sendDate,
-pic.contract_num as contractNum,
-pic.contract_name as contractName,
-pic.signed_company_temporary_name as signedCompanyTemporaryName,
-pic.principal_name as principalName,
-pic.principal_id as principalId,
-pcmt.postal_code as postalCode,
-pcmt.contact_address as contactAddress,
-pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_contacts_management_temporary as pcmt on(pic.signed_contacts_temporary_id=pcmt.id)
+select * from(
+        SELECT
+        pc.id,
+        pc.post_status as postStatus,
+        pc.send_method as sendMethod,
+        pc.post_no as postNo,
+        pc.liaison_man as liaisonMan,
+        pc.mobile,
+        pc.remark,
+        pc.mailer,
+        pc.send_date as sendDate,
+        pic.contract_num as contractNum,
+        pic.contract_name as contractName,
+        pic.signed_company_temporary_name as signedCompanyTemporaryName,
+        pic.principal_name as principalName,
+        pic.principal_id as principalId,
+        pcmt.postal_code as postalCode,
+        pcmt.contact_address as contactAddress,
+        pc.contract_type as contractType,
+        pc.create_time,
+        pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic
+        on(pc.contract_id=pic.id) left join pay_contacts_management_temporary as pcmt
+        on(pic.signed_contacts_temporary_id=pcmt.id)
 <where>
+pc.contract_type='2'
    <if test="payMailContracrList.contractNum !='' and payMailContracrList.contractNum !=null">
        pic.contract_num like concat('%',concat(#{payMailContracrList.contractNum},'%'))
    </if>
@@ -34,7 +40,45 @@ pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay
      and  pic.principal_id = #{payMailContracrList.principalId}
    </if>
 </where>
-order by post_status ASC , pc.create_time DESC
+union all
+        SELECT
+        pc.id,
+        pc.post_status as postStatus,
+        pc.send_method as sendMethod,
+        pc.post_no as postNo,
+        pc.liaison_man as liaisonMan,
+        pc.mobile,
+        pc.remark,
+        pc.mailer,
+        pc.send_date as sendDate,
+        psc.contract_num as contractNum,
+        psc.contract_name as contractName,
+        psc.signed_company_temporary_name as signedCompanyTemporaryName,
+        psc.principal_name as principalName,
+        psc.principal_id as principalId,
+        psc.post_code as postalCode,
+        psc.address as contactAddress,
+        pc.contract_type as contractType,
+        pc.create_time,
+        psc.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_spending_contract as psc on(pc.contract_id=psc.id)
+        <where>
+        pc.contract_type='1'
+            <if test="payMailContracrList.contractNum !='' and payMailContracrList.contractNum !=null">
+                psc.contract_num like concat('%',concat(#{payMailContracrList.contractNum},'%'))
+            </if>
+            <if test="payMailContracrList.contractName !='' and payMailContracrList.contractName !=null">
+                and  psc.contract_name like concat('%',concat(#{payMailContracrList.contractName},'%'))
+            </if>
+            <if test="payMailContracrList.signedCompanyTemporaryName !='' and payMailContracrList.signedCompanyTemporaryName !=null">
+                and  psc.signed_company_temporary_name like concat('%',concat(#{payMailContracrList.signedCompanyTemporaryName},'%'))
+            </if>
+            <if test="payMailContracrList.principalId !='' and payMailContracrList.principalId !=null">
+                and  psc.principal_id = #{payMailContracrList.principalId}
+            </if>
+        </where>
+        ) pp
+
+order by pp.postStatus ASC , pp.create_time DESC
    </select>

    <select id="checkOne"  resultType="com.jero.mail.entity.PayMailContracrList">
@@ -99,4 +143,4 @@ pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay


    </select>
-</mapper>
+</mapper>
@@ -195,4 +195,10 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {

    AllMoney queryPageListForCompanyDetail33(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, @Param("idList") List<String> idList);

+    AllMoney queryPageListForStatistics33(@Param("payWorkingGroupSearch") PayWorkingGroupSearch payWorkingGroupSearch, @Param("ids") List<String> ids);
+
+    AllMoney queryPageListForPrincipal33(@Param("principalPeopleSearch") PrincipalPeopleSearch principalPeopleSearch, @Param("idList") List<String> idList);
+
+    AllMoney queryPageListForPrincipalDetail33(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch);
+
 }
@@ -7,6 +7,7 @@ import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.project.entity.PayWorkingGroupSubletSearch;
 import com.jero.project.vo.SetChargeInput;
+import com.jero.statistics.entity.AllMoney;
 import com.jero.statistics.entity.AllProjectStatistics;
 import com.jero.statistics.entity.AllProjectStatisticsSearch;
 import org.apache.ibatis.annotations.Param;
@@ -51,4 +52,7 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroup


    List<PayWorkGroupSubletStatistics> importExcelStatistics2(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,@Param("id")  String id,@Param("selections") ArrayList<String> selections);
+
+    AllMoney queryPageList233(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, @Param("id") String id);
+
 }
@@ -179,6 +179,62 @@
                  </choose>
            </where>) ppp
    </select>
+    <!--    工作组统计总金额-->
+    <select id="queryPageListForStatistics33" resultType="com.jero.statistics.entity.AllMoney">
+        select sum(ppp.allMoney) as allMoney,sum(ppp.comeAllMoney) as comeAllMoney from (SELECT
+        pwg.id,
+        pwg.working_group_project AS workGroup,
+        pwg.principal_id_a as principalId,
+        pwgs.allMoney,
+        pwgs.comeAllMoney,
+        pwgs.createTime,
+        CONCAT(CAST(ROUND((pwgs.comeAllMoney/pwgs.allMoney)*100,2) AS CHAR),'%') AS moneyRate
+        FROM pay_working_group pwg left join
+        (
+        SELECT id, createTime,working_group_id,
+        sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from
+        (select pwg1s.id,pwg1s.create_time AS createTime,working_group_id,receivable_amount AS
+        allMoney,paid_amount  AS comeAllMoney
+        from pay_working_group_subitem pwg1s
+        <!--        left join pay_payment_record ppr on(pwg1s.id=ppr.project_id)-->
+        <!--        <if test="payWorkingGroupSearch.year !='' and payWorkingGroupSearch.year !=null">-->
+        <!--        WHERE ppr.payment_date like concat('%',#{payWorkingGroupSearch.year},'%')-->
+        <!--        </if>-->
+        <!--        group by pwg1s.id-->
+        ) pwg2s group by pwg2s.working_group_id
+        )
+        pwgs on(pwg.id=pwgs.working_group_id)
+        <where>
+            <if test="ids != null and ids != ''">
+                and  pwg.principal_id_a in
+                <foreach item="item" open="(" separator="," close=")" collection="ids">
+                    #{item}
+                </foreach>
+            </if>
+            <!--                    and  pwgs.comeAllMoney is not null -->
+            <if test="payWorkingGroupSearch.workGroup != null and payWorkingGroupSearch.workGroup != ''">
+                and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
+            </if>
+            <if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''">
+                AND pwgs.createTime LIKE
+                concat(#{payWorkingGroupSearch.year},'%')
+            </if>
+            <choose>
+                <when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
+                    AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} and if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) <![CDATA[<]]>=
+                    #{payWorkingGroupSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''">
+                        AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney}
+                    </if>
+                    <if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
+                        AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>) ppp
+    </select>

    <!--    工作组统计ids-->
    <select id="queryPageListForStatisticsIds" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
@@ -1949,6 +2005,263 @@
            </choose>
        </where>
    </select>
+    <!--个人来款统计-->
+    <select id="queryPageListForPrincipal33" resultType="com.jero.statistics.entity.AllMoney">
+        select  sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from
+        (select
+        principalId,principalName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney,
+        createTime
+        from
+        (SELECT
+        pwg.principal_id_a as principalId,
+        pwg.principal_name_a as principalName,
+        sum(pwgs.allMoney) as allMoney,
+        sum(pwgs.comeAllMoney) as comeAllMoney,
+        pwg.create_time as createTime
+        FROM pay_working_group pwg
+        right JOIN (
+        select	id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney,
+        create_time
+        from (select
+        pwg1s.id,working_group_id,receivable_amount,paid_amount,create_time
+        from pay_working_group_subitem pwg1s
+        <!--        left join pay_payment_record ppr on(pwg1s.id=ppr.project_id)-->
+        <!--        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
+        <!--            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
+        <!--        </if>-->
+        <!--        group by pwg1s.id-->
+        ) pwgs2
+        GROUP BY pwgs2.working_group_id
+        ) pwgs
+        ON (pwg.id=pwgs.working_group_id)
+        left JOIN sys_user su on(pwg.principal_id_a=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+        <where>
+            <if test="idList != null and idList != ''">
+                pwg.principal_id_a in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
+                AND pwg.principal_id_a=#{principalPeopleSearch.principalId}
+            </if>
+            <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
+                AND pwgs.create_time LIKE
+                concat(#{principalPeopleSearch.year},'%')
+            </if>
+            <if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
+                AND su.org_code =#{principalPeopleSearch.departCode}
+            </if>
+        </where>  GROUP BY pwg.principal_id_a
+
+        union all
+        SELECT
+        pcp1.principal_id as principalId,
+        pcp1.principal_name as principalName,
+        sum(pcp1.receivable_amount) as allMoney,
+        sum(pcp1.paid_amount) as comeAllMoney,
+        pcp1.create_time as createTime
+        FROM
+        (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time from
+        pay_common_project pcp
+        <!--        left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
+        <!--        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
+        <!--            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
+        <!--        </if>-->
+        <!--        group by pcp.id-->
+        ) pcp1
+        left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd
+        on(su.org_code=sd.org_code)
+        <where>
+            <if test="idList != null and idList != ''">
+                pcp1.principal_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
+                AND su.org_code =#{principalPeopleSearch.departCode}
+            </if>
+            <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
+                AND pcp1.create_time LIKE
+                concat(#{principalPeopleSearch.year},'%')
+            </if>
+            <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
+                AND pcp1.principal_id=#{principalPeopleSearch.principalId}
+            </if>
+        </where>  group by pcp1.principal_id
+        union all
+        select
+        pmp.director_id as principalId,
+        su.realname as principalName,
+        SUM(pmps.allMoney) AS allMoney,
+        SUM(pmps.comeAllMoney) AS comeAllMoney,
+        pmp.create_time as createTime
+        FROM pay_member_project pmp
+        right join (
+        select id,projectId,sum(amount_receivable) AS allMoney,sum(paid_amount)  AS comeAllMoney,create_time from(
+        select pmp1s.id,pmp1s.project_id as projectId,amount_receivable,paid_amount,create_time from
+        pay_member_project_subitem pmp1s
+        <!--        left join pay_payment_record ppr on(pmp1s.id=ppr.project_id)-->
+        <!--        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
+        <!--            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
+        <!--        </if>-->
+        <!--        GROUP BY pmp1s.id-->
+        ) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId)
+        left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+        <where>
+            <if test="idList != null and idList != ''">
+                pmp.director_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
+                AND pmps.create_time LIKE
+                concat(#{principalPeopleSearch.year},'%')
+            </if>
+
+            <if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
+                AND su.org_code =#{principalPeopleSearch.departCode}
+            </if>
+            <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
+                AND pmp.director_id=#{principalPeopleSearch.principalId}
+            </if>
+        </where> group by pmp.director_id
+        union all
+        SELECT
+        pm.director_id as principalId,
+        su.realname as principalName,
+        sum(pms.allMoney) as allMoney,
+        sum(pms.comeAllMoney) as comeAllMoney,
+        pm.create_time as createTime
+        FROM pay_meeting pm right join (
+        select id,meeting_id,SUM(amount_receivable) AS
+        allMoney,SUM(paid_amount) AS comeAllMoney,create_time
+        from
+        (select pm1s.id,meeting_id,amount_receivable,paid_amount,create_time from pay_meeting_situation pm1s
+        <!--        left join pay_payment_record ppr on(pm1s.id=ppr.project_id)-->
+        <!--        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
+        <!--            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
+        <!--        </if>-->
+        <!--        GROUP BY pm1s.id-->
+        ) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id)
+        left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+
+        <where>
+            <if test="idList != null and idList != ''">
+                pm.director_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
+                AND su.org_code =#{principalPeopleSearch.departCode}
+            </if>
+            <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
+                AND pms.create_time LIKE
+                concat(#{principalPeopleSearch.year},'%')
+            </if>
+
+            <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
+                AND pm.director_id=#{principalPeopleSearch.principalId}
+            </if>
+        </where> group by  pm.director_id
+        union all
+        SELECT
+        tmp.director_id as principalId,
+        su.realname as principalName,
+        sum(tmps.allMoney) as allMoney,
+        sum(tmps.comeAllMoney) as comeAllMoney,
+        tmp.create_time as createTime
+        FROM tb_member_project tmp right join (
+        select id,project_id,SUM(amount_receivable) AS
+        allMoney,SUM(paid_amount) AS comeAllMoney,create_time
+        from
+        (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,create_time from tb_member_project_subitem tmps1
+        <!--        left join pay_payment_record ppr on(tmps1.id=ppr.project_id)-->
+        <!--        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
+        <!--            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
+        <!--        </if>-->
+        <!--        GROUP BY tmps1.id-->
+        ) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id)
+        left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+        <where>
+            <if test="idList != null and idList != ''">
+                tmp.director_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
+                AND tmps.create_time LIKE
+                concat(#{principalPeopleSearch.year},'%')
+            </if>
+            <if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
+                AND su.org_code =#{principalPeopleSearch.departCode}
+            </if>
+
+            <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
+                AND tmp.director_id=#{principalPeopleSearch.principalId}
+            </if>
+        </where> group by  tmp.director_id
+        union all
+        SELECT
+        tmp.director_id as principalId,
+        su.realname as principalName,
+        sum(tmps.allMoney) as allMoney,
+        sum(tmps.comeAllMoney) as comeAllMoney,
+        tmp.create_time as createTime
+        FROM tb_member_project tmp right join (
+        select id,project_id,SUM(amount_receivable) AS
+        allMoney,SUM(paid_amount) AS comeAllMoney,create_time
+        from
+        (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount ,create_time from tb_certificate_payment tmps1
+        <!--        left join pay_payment_record ppr on(tmps1.id=ppr.project_id)-->
+        <!--        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
+        <!--            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
+        <!--        </if>-->
+        <!--        GROUP BY tmps1.id-->
+        ) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id)
+        left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+
+        <where>
+            <if test="idList != null and idList != ''">
+                tmp.director_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
+                AND su.org_code =#{principalPeopleSearch.departCode}
+            </if>
+            <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
+                AND tmps.create_time LIKE
+                concat(#{principalPeopleSearch.year},'%')
+            </if>
+            <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
+                AND tmp.director_id=#{principalPeopleSearch.principalId}
+            </if>
+        </where> group by  tmp.director_id
+        ) pp
+        group by pp.principalId order by pp.createTime) ppp
+        <where>
+            <choose>
+                <when test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != '' and principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''">
+                    ppp.allMoney >= #{principalPeopleSearch.allMoney} and ppp.allMoney <![CDATA[<]]>=
+                    #{principalPeopleSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != ''">
+                        AND ppp.allMoney >= #{principalPeopleSearch.allMoney}
+                    </if>
+                    <if test="principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''">
+                        AND ppp.allMoney <![CDATA[<]]>= #{principalPeopleSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+    </select>
 <!--首页个人前十-->
    <select id="queryPageListForPrincipalFirstPage" resultType="com.jero.statistics.entity.PrincipalPeopleList">
        select  principalId, principalName,allMoney,comeAllMoney,createTime,
@@ -2382,6 +2695,322 @@
 <!--      ) pprr on(pp.id=pprr.id)-->
 <!--      order by pprr.payment_date desc-->
  </select>
+    <!--    个人来款详情总金额-->
+    <select id="queryPageListForPrincipalDetail33" resultType="com.jero.statistics.entity.AllMoney">
+        select  sum(pp.allMoney) as allMoney, sum(pp.comeAllMoney) as comeAllMoney from  (SELECT
+        pwgs.create_time as createTime,
+        pwgs.id,
+        pwgs.charge_company_temporary_name as chargeCompanyTemporaryName,
+        pwg.working_group_project as projectName,
+        pwg.principal_id_a as principalId,
+        pwgs.receivable_amount AS allMoney,
+        pwgs.paid_amount AS comeAllMoney,
+        pwgs.pack as pack,
+        pwgs.charge_use as chargeUse
+        FROM pay_working_group_subitem pwgs
+        inner join pay_working_group pwg on (pwgs.working_group_id=pwg.id)
+        <where>
+            pwg.principal_id_a = #{principalPeopleDetailSearch.principalNameId}
+            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
+                AND pwg.working_group_project LIKE
+                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
+            </if>
+            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
+                AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse}
+            </if>
+            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
+                AND pwgs.create_time LIKE
+                concat(#{principalPeopleDetailSearch.year},'%')
+            </if>
+            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
+                AND pwgs.in_account=#{principalPeopleDetailSearch.inAccountStatue}
+            </if>
+            <choose>
+                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                    AND   pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>=
+                    #{principalPeopleDetailSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
+                        AND pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
+                    </if>
+                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                        AND pwgs.receivable_amount <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+        union ALL
+        SELECT
+        pcp.create_time as createTime,
+        pcp.id,
+        pcp.charge_company_temporary_name as chargeCompanyTemporaryName,
+        pcp.charge_project as projectName,
+        pcp.principal_id as principalId,
+        pcp.receivable_amount AS allMoney,
+        pcp.paid_amount AS comeAllMoney,
+        pcp.pack as pack,
+        pcp.charge_use as chargeUse
+        FROM pay_common_project pcp
+        <where>
+            pcp.principal_id = #{principalPeopleDetailSearch.principalNameId}
+            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
+                AND pcp.charge_project LIKE
+                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
+            </if>
+            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
+                AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
+            </if>
+            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
+                AND pcp.create_time LIKE
+                concat(#{principalPeopleDetailSearch.year},'%')
+            </if>
+            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
+                AND pcp.in_account=#{principalPeopleDetailSearch.inAccountStatue}
+            </if>
+            <choose>
+                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                    AND   pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>=
+                    #{principalPeopleDetailSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
+                        AND pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
+                    </if>
+                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                        AND pcp.receivable_amount <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+        union ALL
+        SELECT
+        pms.create_time as createTime,
+        pms.id,
+        pms.company_name as chargeCompanyTemporaryName,
+        pm.meeting_name as projectName,
+        pm.director_id as principalId,
+        pms.amount_receivable AS allMoney,
+        pms.paid_amount AS comeAllMoney,
+        pms.pack as pack,
+        pms.charge_use as chargeUse
+        FROM pay_meeting pm inner join pay_meeting_situation pms on(pm.id=pms.meeting_id)
+        <where>
+            pm.director_id = #{principalPeopleDetailSearch.principalNameId}
+            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
+                AND pm.meeting_name LIKE
+                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
+            </if>
+            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
+                AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
+            </if>
+            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
+                AND pms.create_time LIKE
+                concat(#{principalPeopleDetailSearch.year},'%')
+            </if>
+            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
+                AND pms.in_account=#{principalPeopleDetailSearch.inAccountStatue}
+            </if>
+            <choose>
+                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                    AND  pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>=
+                    #{principalPeopleDetailSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
+                        AND pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
+                    </if>
+                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                        AND pms.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+        union ALL
+        SELECT
+        pmps.create_time as createTime,
+        pmps.id,
+        pmps.company_name as chargeCompanyTemporaryName,
+        pmp.project_name as projectName,
+        pmp.director_id as principalId,
+        pmps.amount_receivable AS allMoney,
+        pmps.paid_amount AS comeAllMoney,
+        pmps.pack as pack,
+        pmps.charge_use as chargeUse
+        FROM pay_member_project pmp inner join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
+        <where>
+            pmp.director_id = #{principalPeopleDetailSearch.principalNameId}
+            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
+                AND pmp.project_name LIKE
+                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
+            </if>
+            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
+                AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
+            </if>
+            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
+                AND pmps.create_time LIKE
+                concat(#{principalPeopleDetailSearch.year},'%')
+            </if>
+            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
+                AND pmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
+            </if>
+            <choose>
+                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                    AND  pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>=
+                    #{principalPeopleDetailSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
+                        AND pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
+                    </if>
+                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                        AND pmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+        union ALL
+        SELECT
+        tmps.create_time as createTime,
+        tmps.id,
+        tmps.company_name as chargeCompanyTemporaryName,
+        tmp.project_name as projectName,
+        tmp.director_id as principalId,
+        tmps.amount_receivable AS allMoney,
+        tmps.paid_amount AS comeAllMoney,
+        tmps.pack as pack,
+        tmps.charge_use as chargeUse
+        FROM tb_member_project tmp inner join tb_member_project_subitem tmps on(tmp.id=tmps.project_id)
+        <where>
+            tmp.director_id = #{principalPeopleDetailSearch.principalNameId}
+            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
+                AND tmp.project_name LIKE
+                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
+            </if>
+            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
+                AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
+            </if>
+            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
+                AND tmps.create_time LIKE
+                concat(#{principalPeopleDetailSearch.year},'%')
+            </if>
+            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
+                AND tmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
+            </if>
+            <choose>
+                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                    AND  tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
+                    #{principalPeopleDetailSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
+                        AND tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
+                    </if>
+                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                        AND tmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+        union ALL
+        SELECT
+        tmps.create_time as createTime,
+        tmps.id,
+        tmps.company_name as chargeCompanyTemporaryName,
+        tmp.project_name as projectName,
+        tmp.director_id as principalId,
+        tmps.amount_receivable AS allMoney,
+        tmps.paid_amount AS comeAllMoney,
+        tmps.pack as pack,
+        tmps.charge_use as chargeUse
+        FROM tb_member_project tmp inner join tb_certificate_payment tmps on(tmp.id=tmps.project_id)
+        <where>
+            tmp.director_id = #{principalPeopleDetailSearch.principalNameId}
+            <if test="principalPeopleDetailSearch.projectName != null and principalPeopleDetailSearch.projectName != ''">
+                AND tmp.project_name LIKE
+                concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
+            </if>
+            <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
+                AND tmps.create_time LIKE
+                concat(#{principalPeopleDetailSearch.year},'%')
+            </if>
+            <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
+                AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
+            </if>
+            <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
+                AND tmps.in_account=#{principalPeopleDetailSearch.inAccountStatue}
+            </if>
+            <choose>
+                <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                    AND  tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
+                    #{principalPeopleDetailSearch.allMoneyTwo}
+                </when>
+                <otherwise>
+                    <if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
+                        AND tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
+                    </if>
+                    <if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
+                        AND tmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+        ) pp
+        <!--    left join-->
+        <!--    &lt;!&ndash;          判断来款项目的来款年份&ndash;&gt;-->
+        <!--   (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
+        <!--      from pay_working_group_subitem pwgs-->
+        <!--      inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
+        <!--      <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
+        <!--      WHERE ppr.payment_date like-->
+        <!--      concat('%',#{principalPeopleDetailSearch.year},'%')-->
+        <!--      </if>-->
+        <!--      GROUP BY pwgs.id-->
+        <!--      union ALL-->
+        <!--      SELECT-->
+        <!--      pcp.id as id,max(ppr.payment_date) as payment_date-->
+        <!--      FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)-->
+        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
+        <!--        WHERE ppr.payment_date like-->
+        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
+        <!--    </if>-->
+        <!--      group by pcp.id-->
+        <!--      union all-->
+        <!--      SELECT-->
+        <!--      pmps.id as id,max(ppr.payment_date) as payment_date from-->
+        <!--       pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)-->
+        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
+        <!--        WHERE ppr.payment_date like-->
+        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
+        <!--    </if>-->
+        <!--      group by pmps.id-->
+        <!--      union all-->
+        <!--      SELECT-->
+        <!--      pms.id as id ,max(ppr.payment_date) as payment_date  from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)-->
+        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
+        <!--        WHERE ppr.payment_date like-->
+        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
+        <!--    </if>-->
+        <!--      group by pms.id-->
+        <!--    union all-->
+        <!--    SELECT-->
+        <!--    tmps.id as id ,max(ppr.payment_date) as payment_date  from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on (tmps.id=ppr.project_id)-->
+        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
+        <!--        WHERE ppr.payment_date like-->
+        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
+        <!--    </if>-->
+        <!--    group by tmps.id-->
+        <!--    union all-->
+        <!--    SELECT-->
+        <!--    tmps.id as id ,max(ppr.payment_date) as payment_date  from tb_certificate_payment  tmps inner join  pay_payment_record ppr on (tmps.id=ppr.project_id)-->
+        <!--    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">-->
+        <!--        WHERE ppr.payment_date like-->
+        <!--        concat('%',#{principalPeopleDetailSearch.year},'%')-->
+        <!--    </if>-->
+        <!--    group by tmps.id-->
+        <!--      ) pprr on(pp.id=pprr.id)-->
+        <!--      order by pprr.payment_date desc-->
+    </select>
    <!--    个人来款详情导出ids-->
    <select id="queryPageListForPrincipalDetailTwo" resultType="com.jero.statistics.entity.PrincipalPeopleDetail">
        select  * from  (SELECT
@@ -3947,4 +4576,5 @@
        <!--        order by pprr.payment_date desc-->
    </select>

+
 </mapper>
@@ -128,6 +128,69 @@
 <!--        ) pwg2 on (pwg2.id=pwg1.id)-->
 <!--      order by pwg2.payment_date-->
    </select>
+    <!--工作组详情总金额-->
+    <select id="queryPageList233" resultType="com.jero.statistics.entity.AllMoney">
+        select sum(pwg1.allMoney) as allMoney,sum(pwg1.comeAllMoney) as comeAllMoney 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.pack,
+        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}
+            <if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
+                AND pwg.working_group_project LIKE
+                concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
+            </if>
+            <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
+                AND pwgs.create_time LIKE
+                concat(#{payWorkingGroupSubletSearch.year},'%')
+            </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 order by pwg1.create_time desc
+        <!--        inner join-->
+        <!--        (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
+        <!--        from pay_working_group_subitem pwgs-->
+        <!--        left join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
+        <!--        <if test="payWorkingGroupSubletSearch.year !='' and payWorkingGroupSubletSearch.year !=null">-->
+        <!--        WHERE ppr.payment_date like  concat('%',#{payWorkingGroupSubletSearch.year},'%')-->
+        <!--        </if>-->
+        <!--        GROUP BY pwgs.id-->
+        <!--        ) pwg2 on (pwg2.id=pwg1.id)-->
+        <!--      order by pwg2.payment_date-->
+    </select>

 <!-- 工作组详情导出 -->
    <select id="importExcelStatistics2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
@@ -226,4 +226,11 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {


    AllMoney queryPageListForCompanyDetail33(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, List<String> idList);
+
+    AllMoney queryPageListForStatistics33(PayWorkingGroupSearch payWorkingGroupSearch,List<String> idList);
+
+    AllMoney queryPageListForPrincipal33(PrincipalPeopleSearch principalPeopleSearch, List<String> idList);
+
+    AllMoney queryPageListForPrincipalDetail33(PrincipalPeopleDetailSearch principalPeopleDetailSearch);
+
 }
@@ -7,6 +7,7 @@ import com.jero.project.entity.PayWorkGroupSubletStatistics;
 import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.entity.PayWorkingGroupSubletSearch;
 import com.jero.project.vo.SetChargeInput;
+import com.jero.statistics.entity.AllMoney;

 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
@@ -108,4 +109,7 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
     * @Exception
     */
    List<String> setCharge(SetChargeInput input);
+
+    AllMoney queryPageList233(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id);
+
 }
@@ -579,6 +579,22 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
        return payWorkingGroupMapper.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch,idList);
    }

+    @Override
+    public AllMoney queryPageListForStatistics33(PayWorkingGroupSearch payWorkingGroupSearch, List<String> idList) {
+        return payWorkingGroupMapper.queryPageListForStatistics33(payWorkingGroupSearch,idList);
+
+    }
+
+    @Override
+    public AllMoney queryPageListForPrincipal33(PrincipalPeopleSearch principalPeopleSearch, List<String> idList) {
+        return payWorkingGroupMapper.queryPageListForPrincipal33(principalPeopleSearch,idList);
+    }
+
+    @Override
+    public AllMoney queryPageListForPrincipalDetail33(PrincipalPeopleDetailSearch principalPeopleDetailSearch) {
+        return payWorkingGroupMapper.queryPageListForPrincipalDetail33(principalPeopleDetailSearch);
+    }
+

    /**
    * @Description 校验是存在关联合同的项目
@@ -46,6 +46,7 @@ import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.project.vo.SetChargeInput;
+import com.jero.statistics.entity.AllMoney;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -934,6 +935,11 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
        return listMsg;
    }

+    @Override
+    public AllMoney queryPageList233(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id) {
+        return this.baseMapper.queryPageList233(payWorkingGroupSubletSearch,id);
+    }
+
    /**
     * @Description 删除项目打包关联，临时企业、联系信息
     * @Author  lqt
@@ -123,8 +123,8 @@ public class AllProjectStatisticsController {
            }
        AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch);

-                hashMap.put("sumOfMoney", allMoney.getAllMoney());
-                hashMap.put("sumOfReallyMoney",allMoney.getComeAllMoney());
+        hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
+        hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
                hashMap.put("pageList",pageList);
                return Result.OK(hashMap);

@@ -199,8 +199,8 @@ public class AllProjectStatisticsController {
            }
        AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch);

-        hashMap.put("sumOfMoney", allMoney.getAllMoney());
-        hashMap.put("sumOfReallyMoney",allMoney.getComeAllMoney());
+        hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
+        hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
            hashMap.put("pageList",pageList);
            return Result.OK(hashMap);

@@ -257,6 +257,14 @@ public class AllProjectStatisticsController {
                            String key = String.valueOf(s.getChargeUse());
                            String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
                            s.setChargeUse_text(payment_charge_use);
+                            //处理为空数据为0
+                                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, AllProjectStatistics.class, "所领导统计");
@@ -301,6 +309,13 @@ public class AllProjectStatisticsController {
                        String key = String.valueOf(s.getChargeUse());
                        String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
                        s.setChargeUse_text(payment_charge_use);
+                        //处理为空数据为0
+                        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, AllProjectStatistics.class, "所领导统计");
@@ -350,6 +365,13 @@ public class AllProjectStatisticsController {
                    String key = String.valueOf(s.getChargeUse());
                    String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
                    s.setChargeUse_text(payment_charge_use);
+                    //处理为空数据为0
+                    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, AllProjectStatistics.class, "项目来款统计");
@@ -100,13 +100,16 @@ public class CompanyComeMoneyStatisticsController {
                if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
                    s.setComeAllMoney("0.00");
                }
+                if(s.getFinishRate()== null || s.getFinishRate().equals("") ) {
+                    s.setFinishRate("0.00%");
+                }

            }
            DecimalFormat df = new DecimalFormat("#,##0.00");
        AllMoney allMoney = payWorkingGroupService.queryPageListForCompany33(companyComeMoneySearch,null);

-        hashMap.put("sumOfMoney",allMoney.getAllMoney());
-            hashMap.put("sumOfReallyMoney", allMoney.getComeAllMoney());
+        hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
+        hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
            hashMap.put("pageList",pageList);
            return Result.OK(hashMap);

@@ -184,8 +187,8 @@ public class CompanyComeMoneyStatisticsController {
                    }
                }
                AllMoney allMoney = payWorkingGroupService.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch,null);
-                hashMap.put("sumOfMoney",allMoney.getAllMoney());
-                hashMap.put("sumOfReallyMoney",allMoney.getComeAllMoney());
+        hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
+        hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
                hashMap.put("pageList", pageList);
                return Result.OK(hashMap);
        }
@@ -225,7 +228,18 @@ public class CompanyComeMoneyStatisticsController {
 //            }

                List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, null);
-
+                //处理为空数据为0
+                for(CompanyComeMoneyList 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 (s.getFinishRate() == null || s.getFinishRate().equals("")) {
+                        s.setFinishRate("0.00%");
+                    }
+                }
                return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计");

    }
@@ -271,6 +285,15 @@ public class CompanyComeMoneyStatisticsController {
                    String key = String.valueOf(s.getChargeUse());
                    String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
                    s.setChargeUse_text(payment_charge_use);
+                    //处理为空数据为0
+                    for(CompanyComeMoneyDetail ss: pageList) {
+                        if (ss.getAllMoney() == null || ss.getAllMoney().equals("")) {
+                            ss.setAllMoney("0.00");
+                        }
+                        if (ss.getComeAllMoney() == null || ss.getComeAllMoney().equals("")) {
+                            ss.setComeAllMoney("0.00");
+                        }
+                    }
                }
                return AmountUtil.exportListXls(pageList, CompanyComeMoneyDetail.class, "企业来款详情统计");

@@ -14,6 +14,7 @@ import com.jero.project.entity.PayWorkingGroupStatistics;
 import com.jero.project.entity.PayWorkingGroupSubletSearch;
 import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
+import com.jero.statistics.entity.AllMoney;
 import com.jero.util.AmountUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -89,35 +90,38 @@ public class PayWorkingGroupStatisticsController {
        IPage<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,null);
        List<PayWorkingGroupStatistics> records = pageList.getRecords();
        for (PayWorkingGroupStatistics payWorkingGroupStatistics:records){
-            if(payWorkingGroupStatistics.getComeAllMoney()==null||payWorkingGroupStatistics.getComeAllMoney()==""){
+            if(payWorkingGroupStatistics.getComeAllMoney()==null|| payWorkingGroupStatistics.getComeAllMoney().equals("")){
                payWorkingGroupStatistics.setComeAllMoney("0.00");
            }
        }
-        //计算应收和实收总金额
-        double sum=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();
-             sumTwo = records.stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.00" : t.getComeAllMoney())).sum();
-        }
+        AllMoney allMoney = payWorkingGroupService.queryPageListForStatistics33(payWorkingGroupSearch,null);
+
+//        //计算应收和实收总金额
+//        double sum=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();
+//             sumTwo = records.stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.00" : t.getComeAllMoney())).sum();
+//        }
+//        DecimalFormat df = new DecimalFormat("#,##0.00");
        //处理为空数据为0
        for(PayWorkingGroupStatistics s: pageList.getRecords()){
            if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
                s.setAllMoney("0.00");
            }
-            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
+            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ){
                s.setComeAllMoney("0.00");
            }
            if(s.getMoneyRate()== null || s.getMoneyRate().equals("") ) {
                s.setMoneyRate("0.00%");
            }
        }
-        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
-        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", sumTwo==0.0?sumTwo:df.format(sumTwo));
-        return Result.OK(objectObjectHashMap);
+        HashMap<String, Object> hashMap = new HashMap<>();
+
+        hashMap.put("pageList",pageList.setRecords(records));
+        hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
+        hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
+        return Result.OK(hashMap);
    }

    /**
@@ -235,12 +239,14 @@ public class PayWorkingGroupStatisticsController {
            payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
            Page<PayWorkGroupSubletStatistics> page = new Page<>(pageNo, pageSize);
            IPage<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch,id);
-            double sum=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();
-                 sumTwo = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0.0" : t.getComeAllMoney())).sum();
-            }
+            AllMoney allMoney = payWorkingGroupSubItemService.queryPageList233(payWorkingGroupSubletSearch,id);
+
+//        double sum=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();
+//                 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("#,##0.00");
            //        转义来款用途
@@ -258,8 +264,8 @@ public class PayWorkingGroupStatisticsController {
               }
           }
            hashMap.put("pageList",pageList);
-            hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
-            hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
+        hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
+        hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
            return Result.OK(hashMap);
    }

@@ -301,6 +307,7 @@ public class PayWorkingGroupStatisticsController {
                if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
                    s.setComeAllMoney("0.00");
                }
+
            }
            return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
        }
@@ -95,7 +95,9 @@ public class PrincipalPeopleStatisticsController {
            }
            Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);
            IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList);
-            HashMap<String, Object> hashMap = new HashMap<>();
+        AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipal33(principalPeopleSearch,idList);
+
+        HashMap<String, Object> hashMap = new HashMap<>();
             double sum=0;
             double sumTwo =0;
            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
@@ -115,8 +117,8 @@ public class PrincipalPeopleStatisticsController {
                }
            }
            DecimalFormat df = new DecimalFormat("#,##0.00");
-            hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
-            hashMap.put("sumOfReallyMoney", sumTwo==0.0?sumTwo:df.format(sumTwo));
+            hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
+            hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
            hashMap.put("pageList",pageList);
            return Result.OK(hashMap);

@@ -135,9 +137,10 @@ public class PrincipalPeopleStatisticsController {
    public Result<?> listForDetail(PrincipalPeopleDetailSearch principalPeopleDetailSearch,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-            Page<PrincipalPeopleDetail> page = new Page<>(pageNo, pageSize);
-            IPage<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch);
-            HashMap<String, Object> hashMap = new HashMap<>();
+        Page<PrincipalPeopleDetail> page = new Page<>(pageNo, pageSize);
+        IPage<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch);
+        AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipalDetail33(principalPeopleDetailSearch);
+        HashMap<String, Object> hashMap = new HashMap<>();
            double sum=0;
            double sumTwo =0;
            if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
@@ -160,8 +163,8 @@ public class PrincipalPeopleStatisticsController {
                }

            }
-            hashMap.put("sumOfMoney", sum == 0.0 ? sum : df.format(sum));
-            hashMap.put("sumOfReallyMoney", sumTwo == 0.0 ? sumTwo : df.format(sumTwo));
+            hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getAllMoney())?0:allMoney.getAllMoney());
+            hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)&&ObjectUtils.isEmpty(allMoney.getComeAllMoney())?0:allMoney.getComeAllMoney());
            hashMap.put("pageList", pageList);
            return Result.OK(hashMap);
    }