add:理事会成员列表

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java

@@ -3,14 +3,17 @@ package com.jero.data.controller;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
@@ -23,7 +26,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.mail.commont.constant;
+import com.jero.meeting.entity.PayMeetingRemindRecord;
+import com.jero.meeting.service.IPayMeetingRemindRecordService;
 import com.jero.modules.system.util.SecurityUtil;
+import com.jero.project.common.PayProjectCommon;
 import com.jero.util.AmountUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -51,6 +57,8 @@ import io.swagger.annotations.ApiOperation;
 public class PayCaseCouncilSubitemController extends JeroController<PayCaseCouncilSubitem, IPayCaseCouncilSubitemService> {
 	@Autowired
 	private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
+	 @Resource
+	 private IPayMeetingRemindRecordService payMeetingRemindRecordService;
 
 	 /**
 	  * 理事会成员表
@@ -188,23 +196,45 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 		this.payCaseCouncilSubitemService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-//
+
-//	/**
+	 /**
-//	 * 通过id查询
+	  * 理事会成员表
-//	 *
+	  */
-//	 * @param id
+	 @DictPoint
-//	 * @return
+	 @ApiOperation(value="理事会成员表-列表查询", notes="理事会成员表-列表查询")
-//	 */
+	 @GetMapping(value = "/list")
-//	@AutoLog(value = "理事会成员-通过id查询")
+	 public Result<?> queryPageList(@RequestParam(name="id",required = true) String id,
-//	@ApiOperation(value="理事会成员-通过id查询", notes="理事会成员-通过id查询")
+									@RequestParam(name="companyName",required = false) String companyName,
-//	@GetMapping(value = "/queryById")
+									@RequestParam(name="meetingId",required = false) String meetingId) {
-//	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		 QueryWrapper<subCouncil> queryWrapper = Wrappers.query();
-//		PayCaseCouncilSubitem payCaseCouncilSubitem = payCaseCouncilSubitemService.getById(id);
+		 queryWrapper.eq("pm.council_id", id);
-//		if(payCaseCouncilSubitem==null) {
+		 if (StringUtils.isNotBlank(companyName)){
-//			return Result.error("未找到对应数据");
+			 queryWrapper.like("pm.company_name",companyName);
-//		}
+		 }
-//		return Result.OK(payCaseCouncilSubitem);
+		 List<subCouncil> list = payCaseCouncilSubitemService.listTwo(queryWrapper);
-//	}
+		 if (!CollectionUtils.isEmpty(list)) {
+			 try {
+				 list.forEach(p -> {
+					 if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) {
+						 p.setPhone(PasswordUtil.decrypt(p.getPhone()));
+					 }
+					 if (StringUtils.isNotBlank(meetingId)){
+						 LambdaQueryWrapper<PayMeetingRemindRecord> wrapper = new LambdaQueryWrapper<>();
+						 wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId());
+						 int count = payMeetingRemindRecordService.count(wrapper);
+						 if (count>0){
+							 p.setRemind(PayProjectCommon.YES);
+						 }else {
+							 p.setRemind(PayProjectCommon.NO);
+						 }
+					 }
+				 });
+			 } catch (Exception e) {
+				 log.error("手机号、邮箱解密异常！", e);
+			 }
+		 }
+		 return Result.OK(list);
+	 }
 
 
 	 /**

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java

@@ -1,5 +1,6 @@
 package com.jero.data.entity;
 
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,6 +24,10 @@ public class subCouncil implements Serializable {
     @ApiModelProperty(value = "职位")
     private String post;
 
+    @ApiModelProperty(value = "是否已提醒")
+    @Dict(dicCode = "yn")
+    private Integer remind;
+
     public subCouncil(String id, String companyName, String peopleName, String phone, String post) {
         this.id = id;
         this.companyName = companyName;

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java

@@ -1,12 +1,11 @@
 package com.jero.data.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.data.entity.ChooseExcelCouncil;
+import com.jero.data.entity.*;
-import com.jero.data.entity.FindByName;
-import com.jero.data.entity.PayCaseCouncilSubitem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jero.data.entity.councilList;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.ArrayList;
@@ -27,4 +26,7 @@ public interface PayCaseCouncilSubitemMapper extends BaseMapper<PayCaseCouncilSu
     List<ChooseExcelCouncil> listForExcel(@Param("contactsNames")String contactsNames, @Param("companyNames")String companyNames,@Param("councilNames") String councilNames);
 
     IPage<councilList> listThreeTwo(Page<councilList> page, @Param("id")String id,@Param("councilNames") String councilNames);
+
+    List<subCouncil> listTwo(@Param(Constants.WRAPPER) QueryWrapper<subCouncil> queryWrapper);
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml

@@ -133,4 +133,13 @@
         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  pm.council_id = #{pid}  order by pm.create_time desc
     </select>
+
+    <select id="listTwo"  resultType="com.jero.data.entity.subCouncil">
+       SELECT pm.id as id, pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as phone
+       from
+        pay_case_council pe
+        left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
+        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
+         ${ew.customSqlSegment}
+    </select>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java

@@ -1,12 +1,10 @@
 package com.jero.data.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.data.entity.ChooseExcelCouncil;
+import com.jero.data.entity.*;
-import com.jero.data.entity.FindByName;
-import com.jero.data.entity.PayCaseCouncilSubitem;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.data.entity.councilList;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,4 +25,6 @@ public interface IPayCaseCouncilSubitemService extends IService<PayCaseCouncilSu
 
     IPage<councilList> listThreeTwo(Page<councilList> page, String id, String councilNames);
 
+    List<subCouncil> listTwo(QueryWrapper<subCouncil> queryWrapper);
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java

@@ -1,11 +1,9 @@
 package com.jero.data.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.data.entity.ChooseExcelCouncil;
+import com.jero.data.entity.*;
-import com.jero.data.entity.FindByName;
-import com.jero.data.entity.PayCaseCouncilSubitem;
-import com.jero.data.entity.councilList;
 import com.jero.data.mapper.PayCaseCouncilSubitemMapper;
 import com.jero.data.service.IPayCaseCouncilSubitemService;
 import org.springframework.stereotype.Service;
@@ -47,5 +45,10 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl<PayCaseCouncil
         return payCaseCouncilSubitemMapper.listThreeTwo(page,id,councilNames);
     }
 
+    @Override
+    public List<subCouncil> listTwo(QueryWrapper<subCouncil> queryWrapper) {
+        return payCaseCouncilSubitemMapper.listTwo(queryWrapper);
+    }
+
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java

@@ -93,13 +93,17 @@ public class PayProjectCommon {
     public static final Integer YES = 1;
 
     /**
-     * 项目类型1:工作组，2：分标委
+     * 项目类型1:工作组，2：分标委, 3:理事会
      */
     public final static Integer PROJECT_TYPE_FILE1 = 1;
     /**
-     * 项目类型1:工作组，2：分标委
+     * 项目类型1:工作组，2：分标委, 3:理事会
      */
     public final static Integer PROJECT_TYPE_FILE2 = 2;
+    /**
+     * 项目类型1:工作组，2：分标委, 3:理事会
+     */
+    public final static Integer PROJECT_TYPE_FILE3 =3;
     /**
      * 需要发票（1：增值税普通发票，2：增值税专用发票，0：否，3：需要发票（小程序需要））
      */

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java

@@ -197,6 +197,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 	 * @param id
 	 * @return
 	 */
+	@Transactional
 	@AutoLog(value = "在研项目-通过id删除")
 	@ApiOperation(value="在研项目-通过id删除", notes="在研项目-通过id删除")
 	@GetMapping(value = "/delete")

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDataFile.java

@@ -41,7 +41,7 @@ public class PayWorkingGroupDataFile implements Serializable {
     @Size(max = 32,message = "项目id长度不能大于32个字符")
     private java.lang.String projectId;
     /**项目类型1:工作组，2：分标委*/
-    @ApiModelProperty(value = "项目类型1:工作组，2：分标委")
+    @ApiModelProperty(value = "项目类型1:工作组，2：分标委,3:理事会")
     @NotEmpty(message = "项目类型1不能为空")
     private java.lang.Integer projectType;
 	/**文件id*/