update:在会员项目被拉入打包后，自动生成会员有效期

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java

@@ -7,24 +7,15 @@ import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.format.DateParser;
-import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.oConvertUtils;
-import com.jero.member.entity.PayMemberProjectSubitem;
+import com.jero.company.entity.PayCompanyManagement;
-import com.jero.member.entity.TbMemberProject;
+import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -60,6 +51,8 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
 	 @Resource
 	 private ISysBaseAPI sysBaseAPI;
+	 @Resource
+	 private IPayCompanyManagementService payCompanyManagementService;
 	/**
 	 * 分页列表查询
 	 */
@@ -285,7 +278,15 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		} else {
 			exportList = pageList;
 		}
-
+		for (TbMemberProjectSubitem memberProjectSubitem : exportList) {
+			String companyId = memberProjectSubitem.getCompanyId();
+			if (StringUtils.isNotBlank(companyId)) {
+				PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(companyId);
+				if (!Objects.isNull(payCompanyManagement)) {
+					memberProjectSubitem.setDutyCode(payCompanyManagement.getDutyCode());
+				}
+			}
+		}
         return super.exportListXls(exportList, TbMemberProjectSubitem.class, "标协会员项目成员表");
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml

@@ -88,10 +88,9 @@
     </select>
 
     <select id="pageList" resultMap="TbMemberProjectSubitemResultMap">
-        select distinct tmps.*,pcm.duty_code
+        select distinct tmps.*
         from tb_member_project_subitem tmps
             LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id
-            LEFT JOIN pay_company_management pcm on tmps.company_id = pcm.id
         ${ew.customSqlSegment}
     </select>
 

jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java

@@ -21,6 +21,7 @@ import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.member.mapper.TbCertificatePaymentMapper;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
+import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.pack.common.PackCommon;
@@ -85,6 +86,8 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
     private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
     @Resource
     private TbCertificatePaymentMapper certificatePaymentMapper;
+    @Resource
+    private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
 
 
     @Override
@@ -134,6 +137,11 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
             payPackCompanyProjectNew.setPackId(payPackCompanyProject.getPackId());
             payPackCompanyProjectNew.setCome(PackCommon.COME2);
             listPayPackCompanyProject.add(payPackCompanyProjectNew);
+            // 生成会员有效期
+            TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemService.getById(s1);
+            if (!Objects.isNull(tbMemberProjectSubitem)) {
+                tbMemberProjectSubitemService.generateValidDate(s1);
+            }
         }
         LambdaQueryWrapper<PayPackCompanyProject> query = new LambdaQueryWrapper<>();
         query.in(PayPackCompanyProject::getProjectId, Arrays.asList(payPackCompanyProject.getProjectIds()));