From 81e11244b676ed33c867d49bab24dc3dad2e8bea Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Thu, 16 Dec 2021 09:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E9=A1=B9=E7=9B=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemController.java     | 28 +++++++++++--------
 .../entity/PayWorkingGroupSubItem.java        | 25 +++++++++++------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index bedba1e2..5c4ddfb0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -1,12 +1,9 @@
 package com.jero.project.controller;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.dto.SendMessageDTO;
@@ -36,14 +33,15 @@ import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
 import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.project.common.PayProjectCommon;
-import com.jero.project.entity.*;
+import com.jero.project.entity.PayWorkingGroup;
+import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.project.vo.SetChargeInput;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
+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;
@@ -51,8 +49,12 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
  /**
  * @Description: 工作组成员
  * @Author: jeecg-boot
@@ -272,8 +274,10 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 							 }
 						 }
 					 }
-				 	p.setPrincipalName(listPrincipalIdA.get(0).getPrincipalNameA());
-				 	p.setYear(listPrincipalIdA.get(0).getYear());
+					 p.setOperationCycle(listPrincipalIdA.get(0).getOperationCycle());
+					 p.setMissionAndObjectives(listPrincipalIdA.get(0).getMissionAndObjectives());
+				 	 p.setPrincipalName(listPrincipalIdA.get(0).getPrincipalNameA());
+				 	 p.setYear(listPrincipalIdA.get(0).getYear());
 				 }
 			 });
 			 pageList.setRecords(list);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
index db4fb874..ca6de3f7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
@@ -1,24 +1,25 @@
 package com.jero.project.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import com.jero.contract.entity.PayIncomeContract;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @Description: pay_working_group_subitem
@@ -262,4 +263,12 @@ public class PayWorkingGroupSubItem implements Serializable {
      */
     @TableField(exist = false)
     private PayIncomeContract payIncomeContract;
+    /**运行周期*/
+    @ApiModelProperty(value = "运行周期")
+    @TableField(exist = false)
+    private String operationCycle;
+    /**任务及目标*/
+    @ApiModelProperty(value = "任务及目标")
+    @TableField(exist = false)
+    private String missionAndObjectives;
 }