Commit 2c6ab0f3 by qwmqiuwenmin

fix

parent 61c25f45
...@@ -22,4 +22,6 @@ public interface TabHaobanApplicationTemplateMapper { ...@@ -22,4 +22,6 @@ public interface TabHaobanApplicationTemplateMapper {
TabHaobanApplicationTemplate selectByTemplateName(@Param("templateName")String templateName); TabHaobanApplicationTemplate selectByTemplateName(@Param("templateName")String templateName);
List<TabHaobanApplicationTemplate> listByTemplateName(@Param("templateName")String applicationTemplateName); List<TabHaobanApplicationTemplate> listByTemplateName(@Param("templateName")String applicationTemplateName);
TabHaobanApplicationTemplate selectDefaultTemplate();
} }
\ No newline at end of file
...@@ -18,4 +18,6 @@ public interface ApplicationTemplateService { ...@@ -18,4 +18,6 @@ public interface ApplicationTemplateService {
List<ApplicationTemplateDTO> listByTemplateName(String applicationTemplateName); List<ApplicationTemplateDTO> listByTemplateName(String applicationTemplateName);
ApplicationTemplateDTO selectDefaultTemplate();
} }
...@@ -57,4 +57,9 @@ public class ApplicationTemplateServiceImpl implements ApplicationTemplateServic ...@@ -57,4 +57,9 @@ public class ApplicationTemplateServiceImpl implements ApplicationTemplateServic
return EntityUtil.changeEntityListByJSON(ApplicationTemplateDTO.class, mapper.listByTemplateName(applicationTemplateName)); return EntityUtil.changeEntityListByJSON(ApplicationTemplateDTO.class, mapper.listByTemplateName(applicationTemplateName));
} }
@Override
public ApplicationTemplateDTO selectDefaultTemplate() {
return EntityUtil.changeEntityByJSON(ApplicationTemplateDTO.class, mapper.selectDefaultTemplate());
}
} }
...@@ -12,17 +12,21 @@ import cn.hutool.core.collection.CollectionUtil; ...@@ -12,17 +12,21 @@ import cn.hutool.core.collection.CollectionUtil;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.haoban.manage.api.dto.ApplicationDTO; import com.gic.haoban.manage.api.dto.ApplicationDTO;
import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO; import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO; import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.service.ApplicationApiService; import com.gic.haoban.manage.api.service.ApplicationApiService;
import com.gic.haoban.manage.service.dao.mapper.ApplicationMapper; import com.gic.haoban.manage.service.dao.mapper.ApplicationMapper;
import com.gic.haoban.manage.service.entity.TabHaobanApplication; import com.gic.haoban.manage.service.entity.TabHaobanApplication;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated; import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated; import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated;
import com.gic.haoban.manage.service.service.ApplicationService; import com.gic.haoban.manage.service.service.ApplicationService;
import com.gic.haoban.manage.service.service.ApplicationTemplateService;
import com.gic.haoban.manage.service.service.TemplateApplicationRelatedService; import com.gic.haoban.manage.service.service.TemplateApplicationRelatedService;
import com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService; import com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService;
import com.gic.haoban.manage.service.service.WxEnterpriseApplicationRelatedService; import com.gic.haoban.manage.service.service.WxEnterpriseApplicationRelatedService;
import com.gic.haoban.manage.service.service.WxEnterpriseService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -39,6 +43,10 @@ public class ApplicationApiServiceImpl implements ApplicationApiService { ...@@ -39,6 +43,10 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
private TemplateEnterpriseRelatedService templateEnterpriseRelatedService; private TemplateEnterpriseRelatedService templateEnterpriseRelatedService;
@Autowired @Autowired
private TemplateApplicationRelatedService templateApplicationRelatedService; private TemplateApplicationRelatedService templateApplicationRelatedService;
@Autowired
private ApplicationTemplateService applicationTemplateService;
@Autowired
private WxEnterpriseService wxEnterpriseService;
@Override @Override
public List<ApplicationDTO> listApplication() { public List<ApplicationDTO> listApplication() {
List<TabHaobanApplication> list = applicationService.listApplication(); List<TabHaobanApplication> list = applicationService.listApplication();
...@@ -82,9 +90,23 @@ public class ApplicationApiServiceImpl implements ApplicationApiService { ...@@ -82,9 +90,23 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
@Override @Override
public void insertApplicationRelation(String wxEnterpriseId) { public void insertApplicationRelation(String wxEnterpriseId) {
List<TabHaobanApplication> list = applicationService.listApplication(); TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
Set<String> applicationSet = list.stream().map(TabHaobanApplication::getApplicationId).collect(Collectors.toSet()); if(dto == null){
wxEnterpriseApplicationRelatedService.saveEnterpriseApplicationRelateds(applicationSet, wxEnterpriseId); ApplicationTemplateDTO defaultTemplate = applicationTemplateService.selectDefaultTemplate();
if(defaultTemplate != null){
dto = new TemplateEnterpriseRelatedDTO();
dto.setApplicationTemplateId(defaultTemplate.getApplicationTemplateId());
dto.setWxEnterpriseId(wxEnterpriseId);
WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
if(enterprise != null){
dto.setWxEnterpriseName(enterprise.getCorpName());
}
templateEnterpriseRelatedService.insert(dto);
}
}
// List<TabHaobanApplication> list = applicationService.listApplication();
// Set<String> applicationSet = list.stream().map(TabHaobanApplication::getApplicationId).collect(Collectors.toSet());
// wxEnterpriseApplicationRelatedService.saveEnterpriseApplicationRelateds(applicationSet, wxEnterpriseId);
} }
} }
...@@ -123,4 +123,12 @@ ...@@ -123,4 +123,12 @@
</if> </if>
and status_flag = 1 and status_flag = 1
</select> </select>
<select id="selectDefaultTemplate" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from tab_haoban_application_template
where default_flag = 1
and status_flag = 1
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment