From ff52bb437e855ea9c3e7f4f00da469fb2893fe2c Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Wed, 29 May 2024 09:20:30 +0800 Subject: [PATCH] bugfix --- .../BmsEnterpriseBasicInfoController.java | 46 +++++- .../entity/BmsEnterpriseBasicInfo.java | 141 +++++++++++++++--- .../request/EnterpriseInfoWorkRequest.java | 19 +++ .../mapper/BmsEnterpriseBasicInfoMapper.java | 6 + .../IBmsEnterpriseBasicInfoService.java | 3 + .../impl/BmsBigStrongAwardServiceImpl.java | 1 + .../impl/BmsBrandingAwardServiceImpl.java | 1 + ...msCarrierConstructionAwardServiceImpl.java | 1 + .../impl/BmsCreditManagementServiceImpl.java | 1 + .../BmsEnterpriseBasicInfoServiceImpl.java | 6 + ...BmsIndustrialInternetAwardServiceImpl.java | 1 + .../BmsIntegrationIndustriesServiceImpl.java | 1 + ...sLogisticsDevelopmentAwardServiceImpl.java | 1 + ...ManufacturingServicesAwardServiceImpl.java | 1 + ...sPlatformConstructionAwardServiceImpl.java | 1 + .../BmsProjectSettlementAwardServiceImpl.java | 1 + .../impl/BmsSceneOpeningAwardServiceImpl.java | 1 + .../impl/BmsTemplateRecordServiceImpl.java | 48 +----- .../service/impl/CommonServiceImpl.java | 14 +- .../ent/controller/JContactsController.java | 96 ++++++++++++ .../JEnterpriseContactController.java | 4 +- .../ent/controller/JMemorandumController.java | 27 +++- .../ent/controller/JProjectController.java | 18 ++- .../com/ruoyi/jjh/ent/entity/JContacts.java | 77 ++++++++++ .../com/ruoyi/jjh/ent/entity/JMemorandum.java | 19 ++- .../com/ruoyi/jjh/ent/entity/JProject.java | 7 + .../entity/request/JMemorandumRequest.java | 6 + .../ruoyi/jjh/ent/mapper/JContactsMapper.java | 20 +++ .../jjh/ent/mapper/JMemorandumMapper.java | 1 + .../ruoyi/jjh/ent/mapper/JProjectMapper.java | 6 + .../jjh/ent/service/JContactsService.java | 25 ++++ .../jjh/ent/service/JMemorandumService.java | 2 +- .../jjh/ent/service/JProjectService.java | 10 ++ .../jjh/ent/service/impl/JContactsImpl.java | 34 +++++ .../service/impl/JMemorandumServiceImpl.java | 5 + .../ent/service/impl/JProjectServiceImpl.java | 9 +- .../BmsDeclarationRecordsMapper.xml | 4 +- .../BmsEnterpriseBasicInfoMapper.xml | 83 ++++++++--- .../mapper/jjh/ent/JContactsMapper.xml | 18 +++ .../mapper/jjh/ent/JMemorandumMapper.xml | 2 +- .../mapper/jjh/ent/JProjectMapper.xml | 14 ++ 41 files changed, 675 insertions(+), 106 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/request/EnterpriseInfoWorkRequest.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JContactsMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JContactsService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JContactsImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/jjh/ent/JContactsMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java index f1d487f..2bdaa17 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java @@ -1,5 +1,6 @@ package com.ruoyi.jjh.declaration.controller; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -7,7 +8,12 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; +import com.ruoyi.jjh.ent.entity.JMemorandum; +import com.ruoyi.jjh.ent.entity.JProject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -17,6 +23,7 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -27,6 +34,7 @@ import java.util.List; * @author farben * @date 2023-08-25 */ +@Api(tags = "企业基础信息") @RestController @RequestMapping("/system/enterpriseBasicInfo") public class BmsEnterpriseBasicInfoController extends BaseController { @@ -37,6 +45,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController { /** * 查询企业基础信息列表 */ + @ApiOperation(value = "查询企业基础信息列表", response = BmsEnterpriseBasicInfo.class) // @RequiresPermissions("system:enterpriseBasicInfo:list") @GetMapping("/list") public TableDataInfo list(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { @@ -45,10 +54,19 @@ public class BmsEnterpriseBasicInfoController extends BaseController { return getDataTable(list); } + /** + * 作业台查询企业信息 + */ + @ApiOperation(value = "作业台查询企业信息" ,response = BmsEnterpriseBasicInfo.class) + @GetMapping("/workSearch") + public AjaxResult workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) { + return AjaxResult.success(bmsEnterpriseBasicInfoService.workSearch(enterpriseInfoWorkRequest)); + } + /** * 导出企业基础信息列表 */ -// @RequiresPermissions("system:enterpriseBasicInfo:export") + @ApiOperation(value = "导出企业基础信息列表") @Log(title = "企业基础信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { @@ -57,9 +75,31 @@ public class BmsEnterpriseBasicInfoController extends BaseController { util.exportExcel(response, list, "企业基础信息数据"); } + /** + * 导入企业基础信息列表 + */ + @ApiOperation(value = "导入企业基础信息列表") + @Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT) + @PostMapping("/importEnterprise") + public AjaxResult importEnterprise(MultipartFile file) throws Exception{ + List allList = bmsEnterpriseBasicInfoService.list(); + ExcelUtil util = new ExcelUtil<>(BmsEnterpriseBasicInfo.class); + List proList = util.importExcel(file.getInputStream()); + StringBuilder successMsg = new StringBuilder(); + if (proList == null || proList.isEmpty()) { + throw new ServiceException("企业导入数据不能为空"); + } else { + proList.removeIf(entityA -> allList.stream().anyMatch(entityB -> entityB.getCreditCode().equals(entityA.getCreditCode()))); + bmsEnterpriseBasicInfoService.saveBatch(proList); + successMsg.append("导入成功"); + } + return AjaxResult.success(successMsg); + } + /** * 获取企业基础信息详细信息 */ + @ApiOperation(value = "获取企业基础信息详细信息" ,response = BmsEnterpriseBasicInfo.class) // @RequiresPermissions("system:enterpriseBasicInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -69,7 +109,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController { /** * 新增企业基础信息 */ -// @RequiresPermissions("system:enterpriseBasicInfo:add") + @ApiOperation(value = "新增企业基础信息") @Log(title = "企业基础信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { @@ -79,6 +119,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController { /** * 修改企业基础信息 */ + @ApiOperation(value = "修改企业基础信息") // @RequiresPermissions("system:enterpriseBasicInfo:edit") @Log(title = "企业基础信息", businessType = BusinessType.UPDATE) @PutMapping @@ -89,6 +130,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController { /** * 删除企业基础信息 */ + @ApiOperation(value = "删除企业基础信息") // @RequiresPermissions("system:enterpriseBasicInfo:remove") @Log(title = "企业基础信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java index 63083dd..f63a43e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java @@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -16,6 +19,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author farben * @date 2023-08-25 */ +@ApiModel("企业基础信息对象") @Data @EqualsAndHashCode(callSuper = true) public class BmsEnterpriseBasicInfo extends BaseInfoEntity { @@ -31,6 +35,7 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { /** * 企业名称 */ + @ApiModelProperty("企业名称") @JSONField(name = "企业名称") @Excel(name = "企业名称") private String enterpriseName; @@ -38,49 +43,137 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { /** * 企业统一信用代码 */ + @ApiModelProperty("企业统一信用代码") @JSONField(name = "企业统一信用代码") @Excel(name = "企业统一信用代码") private String creditCode; + + /** + * 法定代表人 + */ + @ApiModelProperty("法定代表人") + @JSONField(name = "法定代表人") + @Excel(name = "法定代表人") + private String legalEntity; + + /** + * 经营状态 + */ + @ApiModelProperty("经营状态") + @JSONField(name = "经营状态") + @Excel(name = "经营状态") + private String businessStatus; + + /** + * 成立日期 + */ + @ApiModelProperty("成立日期") + @JSONField(name = "成立日期") + @Excel(name = "成立日期") + private String establishDate; + + /** + * 注册资本 + */ + @ApiModelProperty("注册资本") + @JSONField(name = "注册资本") + @Excel(name = "注册资本") + private String registeredCapital; + + /** + * 企业类型 + */ + @ApiModelProperty("企业类型") + @JSONField(name = "企业类型") + @Excel(name = "企业类型") + private String enterpriseType; + + /** + * 所属行业 + */ + @ApiModelProperty("所属行业") + @JSONField(name = "所属行业") + @Excel(name = "所属行业") + private String industry; + /** - * 联系人 + * 组织机构代码 */ - @JSONField(name = "联系人") - @Excel(name = "联系人") - private String contacts; + @ApiModelProperty("组织机构代码") + @JSONField(name = "组织机构代码") + @Excel(name = "组织机构代码") + private String institutionCode; /** - * 联系人电话 + * 参保人数 */ - @JSONField(name = "联系人电话") - @Excel(name = "联系人电话") - private String contactsNumber; + @ApiModelProperty("参保人数") + @JSONField(name = "参保人数") + @Excel(name = "参保人数") + private String visitorsNum; /** - * 企业地址 + * 曾用名 */ - @JSONField(name = "企业地址") - @Excel(name = "企业地址") - private String address; + @ApiModelProperty("曾用名") + @JSONField(name = "曾用名") + @Excel(name = "曾用名") + private String formerName; + + /** + * 注册地址 + */ + @ApiModelProperty("注册地址") + @JSONField(name = "注册地址") + @Excel(name = "注册地址") + private String enrollAddress; + + + /** + * 注册类型 + */ + @ApiModelProperty("注册类型") + @JSONField(name = "注册类型") + @Excel(name = "注册类型") + private String enrollType; + + /** + * 经营范围 + */ + @ApiModelProperty("经营范围") + @JSONField(name = "经营范围") + @Excel(name = "经营范围") + private String business; + +// /** +// * 联系人 +// */ +// @JSONField(name = "联系人") +// @Excel(name = "联系人") +// private String contacts; +// +// /** +// * 联系人电话 +// */ +// @JSONField(name = "联系人电话") +// @Excel(name = "联系人电话") +// private String contactsNumber; +// +// /** +// * 企业地址 +// */ +// @JSONField(name = "企业地址") +// @Excel(name = "企业地址") +// private String address; /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize=false) @Excel(name = "是否删除",readConverterExp = "0=未删除,1=已删除") private Long isDeleted; - @Override - public String toString() { - return "BmsEnterpriseBasicInfo{" + - "id=" + id + - ", enterpriseName='" + enterpriseName + '\'' + - ", creditCode='" + creditCode + '\'' + - ", contacts='" + contacts + '\'' + - ", contactsNumber='" + contactsNumber + '\'' + - ", address='" + address + '\'' + - ", isDeleted=" + isDeleted + - '}'; - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/request/EnterpriseInfoWorkRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/request/EnterpriseInfoWorkRequest.java new file mode 100644 index 0000000..efcc3ca --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/request/EnterpriseInfoWorkRequest.java @@ -0,0 +1,19 @@ +package com.ruoyi.jjh.declaration.entity.request; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 作业台企业请求体 + * @author du + * @since 2024/5/28 8:55 + */ +@Data +@ApiModel("作业台企业请求体") +public class EnterpriseInfoWorkRequest { + + @ApiModelProperty("企业法人，高管姓名，企业关键字") + private String enterpriseInfo; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java index 8055940..14975a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import java.util.List; @@ -59,4 +60,9 @@ public interface BmsEnterpriseBasicInfoMapper extends BaseMapper workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java index 859498f..e4bd71f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java @@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import java.util.List; @@ -59,4 +60,6 @@ public interface IBmsEnterpriseBasicInfoService extends IService workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java index b75468b..1149eb3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java @@ -138,6 +138,7 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) { + return baseMapper.workSearch(enterpriseInfoWorkRequest); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java index d7a93a6..fced1f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java @@ -116,6 +116,7 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("enterprise_directory", bmsTemplateRecordAddDto.getEnterpriseDirectory()); + List isFlag = baseMapper.selectList(queryWrapper); + if(isFlag.isEmpty()){ + throw new ServiceException("该申报任务标题已经存在"); + } //新增的时候根据当前时间判断状态是否有效 tiTimeChange.getTime(bmsTemplateRecordAddDto); //添加在线模板 @@ -124,61 +130,23 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl drlist = new ArrayList<>(); //如果前端部分企业名录集合为空 if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) { -// //保存所有的信用代码 -// List codeList = new ArrayList<>(); -// for (BmsEnterpriseDirectory x : enterpriseDirectoryList) { -// codeList.add(x.getCreditCode()); -// } -// //根据信用代码去企业信息表里查找该企业，如果能找到并且该企业未填报过该模板 就添加企业id -// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getCreditCode, codeList); -// List list = iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper); - //如果能找到该企业就是集合不为空的话,并且长度和excel企业名录长度一致的话 -// if (!list.isEmpty() & list.size() == enterpriseDirectoryList.size()) { - //保存所有能在企业基础信息里面找的企业id -// List idList = new ArrayList<>(); -// list.forEach(a1 -> { -// idList.add(a1.getId()); - //保存在在线申报模板集合里面 -// }); - List codeList = new ArrayList<>(); enterpriseDirectoryList.forEach(x -> { - codeList.add(x.getCreditCode()); getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId()); x.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); }); - //在在线申报记录里面找到对于该模板和该企业的在线申报记录 - List bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordAddDto.getTemplateId(), codeList); - //如果一条也没有找到就添加到企业名录表里呢 - if (bm.isEmpty()) { - enterpriseDirectoryService.saveBatch(enterpriseDirectoryList); - } else { - //如果有的企业已经对该模板分配过申请任务的话就报错 - throw new ServiceException("某企业已经分配该模板任务"); - } -// }else { -// throw new ServiceException("某企业不在企业信息库"); -// } + enterpriseDirectoryService.saveBatch(enterpriseDirectoryList); } else { List list = iBmsEnterpriseBasicInfoService.list(); List copyList = new ArrayList<>(); - //保存所有的企业信用代码 - List idList = new ArrayList<>(); for (BmsEnterpriseBasicInfo items : list) { BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory(); bms.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); bms.setEnterpriseName(items.getEnterpriseName()); bms.setCreditCode(items.getCreditCode()); - idList.add(items.getCreditCode()); copyList.add(bms); getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId()); } - List bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordAddDto.getTemplateId(), idList); - if (bm.isEmpty()) { - enterpriseDirectoryService.saveBatch(copyList); - } else { - throw new ServiceException("某企业已经分配该模板任务"); - } + enterpriseDirectoryService.saveBatch(copyList); } iBmsDeclarationRecordsService.saveBatch(drlist); return num; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java index e18412a..7ad3bfd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java @@ -150,13 +150,13 @@ public class CommonServiceImpl implements ICommonService { throw new ServiceException("该申请已经错过时间"); } //查看该企业是否已经填报过 - BmsTemplateRecord templateRecordOne = iBmsTemplateRecordService.getById(templateRecordId); - List list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateId, templateRecordOne.getTemplateId()).list(); - list.forEach(x->{ - if(x.getDetailId() != null){ - throw new ServiceException("该企业已经申请，请勿重复申请！"); - } - }); +// BmsTemplateRecord templateRecordOne = iBmsTemplateRecordService.getById(templateRecordId); +// List list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateId, templateRecordOne.getTemplateId()).list(); +// list.forEach(x->{ +// if(x.getDetailId() != null){ +// throw new ServiceException("该企业已经申请，请勿重复申请！"); +// } +// }); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java new file mode 100644 index 0000000..a9157bb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java @@ -0,0 +1,96 @@ +package com.ruoyi.jjh.ent.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.jjh.ent.entity.JContacts; +import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; +import com.ruoyi.jjh.ent.service.JContactsService; +import com.ruoyi.jjh.ent.service.JEnterpriseContactService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.Arrays; + +/** + * 企业联系人信息(存在多个)（j_contacts）表控制层 + * @author du + * @since 2024/5/13 9:56 + */ +@RestController +@RequestMapping("/jjh/jContacts") +@Api(tags = "企业联系人信息(存在多个)") +public class JContactsController extends BaseController { + + @Resource + private JContactsService jContactsService; + + /** + * 分页查询所有数据 + * + * @param jContacts 查询实体 + * @return 所有数据 + */ + @ApiOperation(value = "分页查询所有数据", response = JContacts.class) + @GetMapping + public AjaxResult selectAll( JContacts jContacts) { + if(jContacts.getCreditCode()==null || jContacts.getCreditCode().isEmpty()){ + throw new ServiceException("该企业的信用代码不可为空"); + } + return success(jContactsService.page(jContacts)); + } + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation(value = "通过主键查询单条数据", response = JContacts.class) + @GetMapping("{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(jContactsService.getById(id)); + } + + /** + * 新增数据 + * + * @param jContacts 实体对象 + * @return 新增结果 + */ + @ApiOperation(value = "新增数据") + @PostMapping + public AjaxResult insert(@RequestBody JContacts jContacts) { + return success(jContactsService.save(jContacts)); + } + + /** + * 修改数据 + * + * @param jContacts 实体对象 + * @return 修改结果 + */ + @ApiOperation(value = "修改数据") + @PutMapping + public AjaxResult update(@RequestBody JContacts jContacts) { + return success(jContactsService.updateById(jContacts)); + } + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @ApiOperation(value = "删除数据") + @DeleteMapping + public AjaxResult delete(@RequestParam("id") Long[] id) { + return success(jContactsService.removeByIds(Arrays.asList(id))); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java index 956e7c6..c8c5fab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java @@ -15,13 +15,13 @@ import java.io.Serializable; import java.util.Arrays; /** - * 企业联系人（j_enterprise_contact）表控制层 + * 企业端信息维护（j_enterprise_contact）表控制层 * @author du * @since 2024/5/13 9:56 */ @RestController @RequestMapping("/jjh/jEnterpriseContact") -@Api(tags = "企业联系人") +@Api(tags = "企业端信息维护") public class JEnterpriseContactController extends BaseController { @Resource diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java index 8866481..8f65768 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java @@ -2,9 +2,13 @@ package com.ruoyi.jjh.ent.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.ent.entity.JMemorandum; import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest; import com.ruoyi.jjh.ent.service.JMemorandumService; @@ -21,8 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 备忘录(JMemorandum)表控制层 @@ -54,7 +60,7 @@ public class JMemorandumController extends BaseController { } /** - * 根据关联项目库ID查询该ID下的备忘录 + * 根据关联项目库ID或者企业库ID查询该ID下的备忘录 * * @param jMemorandumRequest 查询实体 * @return 所有数据 @@ -62,8 +68,11 @@ public class JMemorandumController extends BaseController { @ApiOperation(value = "根据关联项目库ID查询该ID下的备忘录", response = JMemorandum.class) @GetMapping("/getIdToList") public AjaxResult selectIdToAll(JMemorandumRequest jMemorandumRequest) { + if (jMemorandumRequest.getType() == null) { + throw new ServiceException("分类不可为空"); + } if (jMemorandumRequest.getProjectId() == null) { - throw new ServiceException("项目库ID不能为空"); + throw new ServiceException("ID不可为空"); } return success(jMemorandumService.selectIdToAll(jMemorandumRequest)); } @@ -77,7 +86,7 @@ public class JMemorandumController extends BaseController { @ApiOperation(value = "通过主键查询单条数据", response = JMemorandum.class) @GetMapping("{id}") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.jMemorandumService.getById(id)); + return success(jMemorandumService.getById(id)); } /** @@ -92,6 +101,18 @@ public class JMemorandumController extends BaseController { return success(jMemorandumService.save(jMemorandum)); } + /** + * 导出备忘录表 + */ + @ApiOperation(value = "导出备忘录表") + @Log(title = "导出备忘录表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, JMemorandumRequest jemorandum) { + List list = jMemorandumService.selectIdToAll(jemorandum); + ExcelUtil util = new ExcelUtil<>(JMemorandum.class); + util.exportExcel(response, list, "备忘录"); + } + /** * 修改数据 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java index 18b597d..117e1de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java @@ -49,10 +49,22 @@ public class JProjectController extends BaseController { */ @ApiOperation(value = "分页查询项目", response = JProject.class) @GetMapping - public AjaxResult selectAll(Page page, JProject jProject) { + public AjaxResult selectPage(Page page, JProject jProject) { return success(jProjectService.page(page, jProject)); } + /** + * 作业台查询所有项目(政务端) + * + * @param name 数据 + * @return 所有数据 + */ + @ApiOperation(value = "作业台查询所有项目(政务端)", response = JProject.class) + @GetMapping("/selectAll") + public AjaxResult selectAll(@RequestParam String name) { + return success(jProjectService.selectAll(name)); + } + /** * 通过主键查询单条数据 * @@ -124,7 +136,7 @@ public class JProjectController extends BaseController { ProjectExcelUtil util = new ProjectExcelUtil<>(JProject.class); List proList = util.importExcel(file.getInputStream()); StringBuilder successMsg = new StringBuilder(); - if (proList == null && proList.isEmpty()) { + if (proList == null || proList.isEmpty()) { throw new ServiceException("项目导入数据不能为空"); } else { jProjectService.saveBatch(proList); @@ -148,7 +160,7 @@ public class JProjectController extends BaseController { ProjectValueUtil util = new ProjectValueUtil<>(JProject.class); List proList = util.importExcel(file.getInputStream(), projectClassify); StringBuilder successMsg = new StringBuilder(); - if (proList == null && proList.isEmpty()) { + if (proList == null || proList.isEmpty()) { throw new ServiceException("项目导入数据不能为空"); } else { jProjectService.saveBatch(proList); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java new file mode 100644 index 0000000..fce1670 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java @@ -0,0 +1,77 @@ +package com.ruoyi.jjh.ent.entity; + +import com.alibaba.fastjson2.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 企业联系人信息(存在多个)（j_contacts）表控制层 + * @author du + * @since 2024/5/13 9:49 + */ +@Data +@ApiModel("企业联系人信息(存在多个)") +@TableName(value = "j_contacts") +public class JContacts extends BaseInfoEntity { + + /** + * Id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty("Id") + private Long id; + + /** + * 联系人姓名 + */ + @Excel(name = "联系人姓名") + @ApiModelProperty("联系人姓名") + private String contactName; + + /** + * 公司职务 + */ + @Excel(name = "公司职务") + @ApiModelProperty("公司职务") + private String firmOffice; + + /** + * 企业统一社会信用代码 + */ + @Excel(name = "企业统一社会信用代码") + @ApiModelProperty("企业统一社会信用代码") + private String creditCode; + + /** + * 手机号 + */ + @Excel(name = "手机号") + @ApiModelProperty("手机号") + private String phone; + + /** + * 邮箱 + */ + @Excel(name = "邮箱") + @ApiModelProperty("邮箱") + private String email; + + + /** + * 创建id + */ + @JSONField(serialize=false) + @TableField(fill = FieldFill.INSERT) + private Long createId; + + /** + * 更新id + */ + @JSONField(serialize=false) + @TableField(fill = FieldFill.UPDATE) + private Long updateId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JMemorandum.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JMemorandum.java index de24e55..92bd8f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JMemorandum.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JMemorandum.java @@ -2,6 +2,7 @@ package com.ruoyi.jjh.ent.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,28 +27,38 @@ public class JMemorandum { @ApiModelProperty("Id") private Long id; /** - * 项目表关联id + * 项目表关联id，或者企业信息表关联id */ - @ApiModelProperty("项目表关联id") + @ApiModelProperty("项目表关联id，或者企业信息表关联id") private Long projectId; + + /** + * 分类 + */ + @Excel(name = "分类",readConverterExp = "1=企业信息,2=项目") + @ApiModelProperty("名字,1=企业信息库的id,2=项目库对应的id") + private String type; + /** * 名字 */ @ApiModelProperty("名字") + @Excel(name = "名字") private String name; /** * 主题/关键字 */ + @Excel(name = "主题/关键字") @ApiModelProperty("主题/关键字") private String keywords; /** * 备忘内容 */ + @Excel(name = "备忘内容") @ApiModelProperty("备忘内容") private String content; - /** * 创建ID */ @@ -59,12 +70,14 @@ public class JMemorandum { * 创建者 */ @ApiModelProperty("创建者") + @Excel(name = "创建者") @TableField(fill = FieldFill.INSERT) private String createBy; /** * 创建时间 */ + @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("创建时间") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java index 60241fb..664a93f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java @@ -58,6 +58,13 @@ public class JProject{ @ApiModelProperty("申报单位") private String declareUnit; + /** + * 企业信用代码 + */ + @Excel(name = "企业信用代码") + @ApiModelProperty("企业信用代码") + private String creditCode; + /** * 年份 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JMemorandumRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JMemorandumRequest.java index d114b42..69b188c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JMemorandumRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JMemorandumRequest.java @@ -22,6 +22,12 @@ public class JMemorandumRequest { @ApiModelProperty("项目库关联ID") private Long projectId; + /** + * 分类 + */ + @ApiModelProperty("名字,1=企业信息库的id,2=项目库对应的id") + private String type; + /** * 名字 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JContactsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JContactsMapper.java new file mode 100644 index 0000000..da455bf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JContactsMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.jjh.ent.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.jjh.ent.entity.JContacts; +import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 企业联系人信息(存在多个)（j_contacts）表控制层 + * @author du + * @since 2024/5/6 13:57 + */ +public interface JContactsMapper extends BaseMapper { + + List page(@Param("req") JContacts jContacts); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JMemorandumMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JMemorandumMapper.java index 76d3e13..53bc305 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JMemorandumMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JMemorandumMapper.java @@ -25,6 +25,7 @@ public interface JMemorandumMapper extends BaseMapper { */ Page page(Page page, @Param("req") JMemorandumRequest jMemorandumRequest); + List page(@Param("req") JMemorandumRequest jMemorandumRequest); /** * 根据关联项目库ID查询该ID下的备忘录 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java index baafb44..a85f2bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java @@ -26,6 +26,8 @@ public interface JProjectMapper extends BaseMapper { */ Page page(Page page,@Param("req") JProject jProject); + List page(@Param("req") JProject jProject); + /** * 通过主键查询该项目的在线流程 * @@ -33,5 +35,9 @@ public interface JProjectMapper extends BaseMapper { * @return 单条数据 */ List getApprovalInfoList(@Param("id") Serializable id); + + + + List selectAll(@Param("name") String name); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JContactsService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JContactsService.java new file mode 100644 index 0000000..7d25af7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JContactsService.java @@ -0,0 +1,25 @@ +package com.ruoyi.jjh.ent.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.ent.entity.JContacts; +import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; + +import java.util.List; + +/** + * 企业联系人信息(存在多个)（j_contacts）表控制层 + * @author du + * @since 2024/5/13 9:58 + */ +public interface JContactsService extends IService { + + /** + * 分页查询所有数据 + * + * @param jContacts 查询实体 + * @return 所有数据 + */ + List page( JContacts jContacts); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JMemorandumService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JMemorandumService.java index 2c993ba..551b17d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JMemorandumService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JMemorandumService.java @@ -24,7 +24,7 @@ public interface JMemorandumService extends IService { */ Page page(Page page, JMemorandumRequest jMemorandumRequest); - + List page( JMemorandumRequest jMemorandumRequest); /** * 根据关联项目库ID查询该ID下的备忘录 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java index b34677d..f028866 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java @@ -47,5 +47,15 @@ public interface JProjectService extends IService { Long saveProject(Map allJson); void updateTheJson( Map allJson); + + /** + * 作业台查询所有项目 + * + * @param jProject 查询实体 + * @return 所有数据 + */ + List selectAll(String jProject); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JContactsImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JContactsImpl.java new file mode 100644 index 0000000..58c5890 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JContactsImpl.java @@ -0,0 +1,34 @@ +package com.ruoyi.jjh.ent.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.jjh.ent.entity.JContacts; +import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; +import com.ruoyi.jjh.ent.mapper.JContactsMapper; +import com.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper; +import com.ruoyi.jjh.ent.service.JContactsService; +import com.ruoyi.jjh.ent.service.JEnterpriseContactService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 企业联系人信息(存在多个)（j_contacts）表控制层 + * @author du + * @since 2024/5/13 9:58 + */ +@Service +public class JContactsImpl extends ServiceImpl implements JContactsService { + + /** + * 分页查询所有数据 + * + * @param jContacts 查询实体 + * @return 所有数据 + */ + @Override + public List page( JContacts jContacts) { + return baseMapper.page(jContacts); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JMemorandumServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JMemorandumServiceImpl.java index 0ce0b49..f848ec5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JMemorandumServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JMemorandumServiceImpl.java @@ -31,6 +31,11 @@ public class JMemorandumServiceImpl extends ServiceImpl page(JMemorandumRequest jMemorandumRequest) { + return baseMapper.page(jMemorandumRequest); + } + /** * 根据关联项目库ID查询该ID下的备忘录 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java index dd2ca3f..79f6f0b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java @@ -3,7 +3,6 @@ package com.ruoyi.jjh.ent.service.impl; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; @@ -86,6 +85,7 @@ public class JProjectServiceImpl extends ServiceImpl i @Override public Long saveProject(Map allJson) { JProject jP = new JProject(); + jP.setCreditCode(allJson.get("credit_code")); jP.setProjectYear(allJson.get("year")); jP.setProjectName(allJson.get("projectName")); jP.setDeclareUnit(allJson.get("declareUnit")); @@ -108,5 +108,12 @@ public class JProjectServiceImpl extends ServiceImpl i jP.setFileJson(allJson.get("fileJson")); baseMapper.updateById(jP); } + + @Override + public List selectAll(String jProject) { + return baseMapper.selectAll(jProject); + } + + } diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml index 172f54e..7c8722e 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml @@ -107,10 +107,10 @@ - and a.status = 0 + and a.status in (0,10) - and a.status != 0 + and a.status is not in (0,10) and a.is_deleted = #{isDeleted} diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml index 012876c..1eef9a7 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml @@ -8,19 +8,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + + + + + + + + + + + - select id, enterprise_name, credit_code, contacts, contacts_number, address, is_deleted, create_by, create_time, update_by, update_time, remark from bms_enterprise_basic_info + select id, enterprise_name, credit_code, + legal_entity,business_status,establish_date,registered_capital, + enterprise_type,industry,institution_code,visitors_num,former_name,enroll_address, + enroll_type,business, + is_deleted, create_by, create_time, update_by, update_time, remark from bms_enterprise_basic_info @@ -39,36 +50,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + insert into bms_enterprise_basic_info id, enterprise_name, credit_code, - contacts, - contacts_number, - address, is_deleted, create_by, create_time, update_by, update_time, remark, + legal_entity, + business_status, + establish_date, + registered_capital, + enterprise_type, + industry, + institution_code, + visitors_num, + former_name, + enroll_address, + enroll_type, + business, + #{id}, #{enterpriseName}, #{creditCode}, - #{contacts}, - #{contactsNumber}, - #{address}, #{isDeleted}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}, + #{legalEntity}, + #{businessStatus}, + #{establishDate}, + #{registeredCapital}, + #{enterpriseType}, + #{industry}, + #{institutionCode}, + #{visitorsNum}, + #{formerName}, + #{enrollAddress}, + #{enrollType}, + #{business}, @@ -77,15 +116,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" enterprise_name = #{enterpriseName}, credit_code = #{creditCode}, - contacts = #{contacts}, - contacts_number = #{contactsNumber}, - address = #{address}, is_deleted = #{isDeleted}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + + legal_entity = #{legalEntity}, + business_status = #{businessStatus}, + establish_date = #{establishDate}, + registered_capital = #{registeredCapital}, + enterprise_type = #{enterpriseType}, + industry = #{industry}, + institution_code = #{institutionCode}, + visitors_num = #{visitorsNum}, + former_name = #{formerName}, + enroll_address = #{enrollAddress}, + enroll_type = #{enrollType}, + business = #{business}, where id = #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JContactsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JContactsMapper.xml new file mode 100644 index 0000000..804146c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JContactsMapper.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml index 16fb6f6..9813d52 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml @@ -21,6 +21,7 @@ diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml index 4032c8c..25f8b3d 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml @@ -7,6 +7,9 @@ +