企业端我的我的合同接口添加

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java

@@ -13,6 +13,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.oConvertUtils;
 import com.jero.contract.common.PayIncomeContractCommon;
@@ -25,11 +26,13 @@ import com.jero.contract.service.IPayIncomeContractAuditService;
 import com.jero.contract.service.IPayIncomeContractInstallmentService;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.contract.vo.*;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.MapExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -102,6 +105,30 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		IPage<PayIncomeContract> pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime);
 		return Result.OK(pageList);
 	}
+
+
+	 /**
+	  * 企业端-分页列表查询
+	  *
+	  * @param payIncomeContract 收入合同
+	  * @param pageNo 页码
+	  * @param pageSize 条数
+	  */
+	 @ApiOperation(value="收入合同-企业端-分页列表查询", notes="收入合同-企业端-分页列表查询")
+	 @GetMapping(value = "/queryCompanyPageList")
+	 public Result<?> queryCompanyPageList(PayIncomeContract payIncomeContract,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+										   HttpServletRequest req) {
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if(Objects.isNull(sysUser)){
+			 return Result.error("没有查到用户信息！");
+		 }
+		 payIncomeContract.setSignedContactsId(sysUser.getId());
+		 Page<PayIncomeContract> page = new Page<>(pageNo, pageSize);
+		 IPage<PayIncomeContract> pageList = payIncomeContractService.queryCompanyPageList(page, payIncomeContract);
+		 return Result.OK(pageList);
+	 }
 	
 	/**
 	 *   添加

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java

@@ -215,4 +215,10 @@ public class PayIncomeContract implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "关联项目")
     private String associatedProject;
+    /**
+     * 邮寄状态
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "邮寄状态")
+    private Integer postStatus;
 }

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java

@@ -30,6 +30,16 @@ public interface PayIncomeContractMapper extends BaseMapper<PayIncomeContract> {
                                                  @Param("chargeStatus") String chargeStatus,@Param("projectName") String projectName,
                                                  @Param("startTime") String startTime, @Param("endTime") String endTime);
 
+    /**
+     * @Description 企业端-查询我的合同列表
+     * @Author  lqt
+     * @Date   2021/9/30
+     * @Param
+     * @Return
+     * @Exception
+     */
+    IPage<PayIncomeContract> queryCompanyPageList(Page<PayIncomeContract> page,@Param("payIncomeContract") PayIncomeContract payIncomeContract);
+
     /**
      * @Description 关联项目列表
      * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml

@@ -186,4 +186,16 @@
         ) a
         ORDER BY createTime,projectId DESC
     </select>
+    <select id="queryCompanyPageList" resultType="com.jero.contract.entity.PayIncomeContract">
+        select pic.*,pmc.post_status as postStatus from pay_income_contract pic
+        left join pay_mail_contract pmc ON pic.id = pmc.contract_id
+        <where> signed_contacts_id = #{payIncomeContract.signedContactsId}
+            <if test="payIncomeContract.contractName != null and payIncomeContract.contractName != ''">
+                AND (pic.contract_name LIKE concat('%',concat(#{payIncomeContract.contractName},'%'))
+                    OR pic.contract_num LIKE concat('%',concat(#{payIncomeContract.contractName},'%'))
+                )
+            </if>
+        </where>
+        group by pic.id order by pic.create_time desc
+    </select>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java

@@ -31,6 +31,17 @@ public interface IPayIncomeContractService extends IService<PayIncomeContract> {
     * @Exception
     */
     IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime);
+
+    /**
+    * @Description 企业端-查询我的合同列表
+    * @Author  lqt
+    * @Date   2021/9/30
+    * @Param
+    * @Return
+    * @Exception
+    */
+    IPage<PayIncomeContract> queryCompanyPageList(Page<PayIncomeContract> page,PayIncomeContract payIncomeContract);
+
     /**
     * @Description 添加
     * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -122,6 +122,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         return payIncomeContractMapper.queryPageList(page,payIncomeContract,chargeStatus,projectName,startTime,endTime);
     }
 
+    @Override
+    public IPage<PayIncomeContract> queryCompanyPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract) {
+        return payIncomeContractMapper.queryCompanyPageList(page,payIncomeContract);
+    }
+
     @Override
     @Transactional
     public PayIncomeContract addPayIncomeContractInput(PayIncomeContractInput input) {

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml

@@ -134,10 +134,10 @@
             <if test="payWorkingGroupSubItem.chargeProject != null and payWorkingGroupSubItem.chargeProject != ''">
                 AND pwg.working_group_project like concat('%',concat(#{payWorkingGroupSubItem.chargeProject},'%'))
             </if>
-            <if test="payWorkingGroupSubItem.pack != null and payWorkingGroupSubItem.pack != ''">
+            <if test="payWorkingGroupSubItem.pack != null">
                 AND pwgs.pack = #{payWorkingGroupSubItem.pack}
             </if>
-            <if test="payWorkingGroupSubItem.needInvoice != null and payWorkingGroupSubItem.needInvoice != ''">
+            <if test="payWorkingGroupSubItem.needInvoice != null">
                 AND pwgs.need_invoice = #{payWorkingGroupSubItem.needInvoice}
             </if>
             <if test="listProjectIds != null and listProjectIds.size() > 0">