wushunjie
杜函宇 10 months ago
parent b56ae9440a
commit 84d48102b9

@ -46,7 +46,7 @@ public class BaseInfoEntity implements Serializable {
*/ */
@JSONField(serialize=false) @JSONField(serialize=false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private Date updateTime;
/** /**

@ -8,6 +8,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto; import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto;
@ -26,6 +27,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -69,6 +71,7 @@ public class BmsDeclarationRecordsController extends BaseController {
* @create 2023/9/9 14:41 * @create 2023/9/9 14:41
*/ */
@ApiOperation(value = "审核列表") @ApiOperation(value = "审核列表")
@PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
@GetMapping("/approvalList") @GetMapping("/approvalList")
public TableDataInfo approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto) { public TableDataInfo approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto) {
startPage(); startPage();
@ -77,6 +80,7 @@ public class BmsDeclarationRecordsController extends BaseController {
} }
@ApiOperation(value = "审批记录信息") @ApiOperation(value = "审批记录信息")
@PreAuthorize("@ss.hasAnyRoles('admin,gov')")
@Log(title = "审批记录信息", businessType = BusinessType.UPDATE) @Log(title = "审批记录信息", businessType = BusinessType.UPDATE)
@PutMapping("/approvalEdit") @PutMapping("/approvalEdit")
public AjaxResult approvalEdit(@RequestBody BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) { public AjaxResult approvalEdit(@RequestBody BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) {
@ -86,10 +90,23 @@ public class BmsDeclarationRecordsController extends BaseController {
/** /**
* 线 * 线
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "查询在线申报记录列表") @ApiOperation(value = "查询在线申报记录列表")
// @RequiresPermissions("system:declarationRecords:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) { public TableDataInfo list(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) {
// 获取当前登录用户是否是企业端
boolean admin = false;
boolean b = false;
String str = null;
try {
admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
b = SecurityUtils.hasRole("ent");
str =SecurityUtils.getUsername();
} catch (Exception ignored) {
}
if(!admin && b){
bmsDeclarationRecordsDto.setCreditCode(str);
}
startPage(); startPage();
List<BmsDeclarationRecordsQueryVo> list = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(bmsDeclarationRecordsDto); List<BmsDeclarationRecordsQueryVo> list = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(bmsDeclarationRecordsDto);
return getDataTable(list); return getDataTable(list);

@ -1,6 +1,8 @@
package com.ruoyi.jjh.declaration.controller; package com.ruoyi.jjh.declaration.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -9,12 +11,14 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.ent.entity.JMemorandum; import com.ruoyi.jjh.ent.entity.JMemorandum;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -35,21 +39,21 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
@Autowired @Autowired
private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService; private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService;
/** /**
* *
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "查询企业基础信息列表", response = BmsEnterpriseBasicInfo.class) @ApiOperation(value = "查询企业基础信息列表", response = BmsEnterpriseBasicInfo.class)
// @RequiresPermissions("system:enterpriseBasicInfo:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { public AjaxResult list(Page<BmsEnterpriseBasicInfo> page,BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
startPage(); return success(bmsEnterpriseBasicInfoService.page(page, bmsEnterpriseBasicInfo));
List<BmsEnterpriseBasicInfo> list = bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo);
return getDataTable(list);
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "作业台查询企业信息" ,response = BmsEnterpriseBasicInfo.class) @ApiOperation(value = "作业台查询企业信息" ,response = BmsEnterpriseBasicInfo.class)
@GetMapping("/workSearch") @GetMapping("/workSearch")
public AjaxResult workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) { public AjaxResult workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) {
@ -59,11 +63,12 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/** /**
* *
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "导出企业基础信息列表") @ApiOperation(value = "导出企业基础信息列表")
@Log(title = "企业基础信息", businessType = BusinessType.EXPORT) @Log(title = "企业基础信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { public void export(HttpServletResponse response, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
List<BmsEnterpriseBasicInfo> list = bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo); List<BmsEnterpriseBasicInfo> list = bmsEnterpriseBasicInfoService.page(bmsEnterpriseBasicInfo);
ExcelUtil<BmsEnterpriseBasicInfo> util = new ExcelUtil<BmsEnterpriseBasicInfo>(BmsEnterpriseBasicInfo.class); ExcelUtil<BmsEnterpriseBasicInfo> util = new ExcelUtil<BmsEnterpriseBasicInfo>(BmsEnterpriseBasicInfo.class);
util.exportExcel(response, list, "企业基础信息数据"); util.exportExcel(response, list, "企业基础信息数据");
} }
@ -71,6 +76,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/** /**
* *
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "导入企业基础信息列表") @ApiOperation(value = "导入企业基础信息列表")
@Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT) @Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT)
@PostMapping(value = "/importEnterprise", consumes = "multipart/form-data") @PostMapping(value = "/importEnterprise", consumes = "multipart/form-data")
@ -82,7 +88,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
if (proList == null || proList.isEmpty()) { if (proList == null || proList.isEmpty()) {
throw new ServiceException("企业导入数据不能为空"); throw new ServiceException("企业导入数据不能为空");
} else { } else {
proList.removeIf(entityA -> allList.stream().anyMatch(entityB -> entityB.getCreditCode().equals(entityA.getCreditCode()))); proList.removeIf(entityA -> allList.stream().anyMatch(entityB -> entityB.getTyshxydm().equals(entityA.getTyshxydm())));
bmsEnterpriseBasicInfoService.saveBatch(proList); bmsEnterpriseBasicInfoService.saveBatch(proList);
successMsg.append("导入成功"); successMsg.append("导入成功");
} }
@ -93,9 +99,22 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
* id * id
*/ */
@ApiOperation(value = "根据信用代码获取该企业id" ,response = BmsEnterpriseBasicInfo.class) @ApiOperation(value = "根据信用代码获取该企业id" ,response = BmsEnterpriseBasicInfo.class)
// @RequiresPermissions("system:enterpriseBasicInfo:query") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@GetMapping(value = "/getCreditCode") @GetMapping(value = "/getCreditCode")
public AjaxResult getCreditCode(@RequestParam String getCreditCode) { public AjaxResult getCreditCode(@RequestParam String getCreditCode) {
// 获取当前登录用户是否是企业端
boolean admin = false;
boolean b = false;
String str = null;
try {
admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
b = SecurityUtils.hasRole("ent");
str =SecurityUtils.getUsername();
} catch (Exception ignored) {
}
if(!admin && b){
getCreditCode=str;
}
return success(bmsEnterpriseBasicInfoService.selectGetCreditCode(getCreditCode)); return success(bmsEnterpriseBasicInfoService.selectGetCreditCode(getCreditCode));
} }
@ -103,41 +122,10 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
* *
*/ */
@ApiOperation(value = "获取企业基础信息详细信息" ,response = BmsEnterpriseBasicInfo.class) @ApiOperation(value = "获取企业基础信息详细信息" ,response = BmsEnterpriseBasicInfo.class)
// @RequiresPermissions("system:enterpriseBasicInfo:query") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) { public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoById(id)); return success(bmsEnterpriseBasicInfoService.getById(id));
}
/**
*
*/
@ApiOperation(value = "新增企业基础信息")
@Log(title = "企业基础信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
return toAjax(bmsEnterpriseBasicInfoService.insertBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo));
} }
/**
*
*/
@ApiOperation(value = "修改企业基础信息")
// @RequiresPermissions("system:enterpriseBasicInfo:edit")
@Log(title = "企业基础信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
return toAjax(bmsEnterpriseBasicInfoService.updateBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo));
}
/**
*
*/
@ApiOperation(value = "删除企业基础信息")
// @RequiresPermissions("system:enterpriseBasicInfo:remove")
@Log(title = "企业基础信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bmsEnterpriseBasicInfoService.deleteBmsEnterpriseBasicInfoByIds(ids));
}
} }

@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@ -43,7 +44,7 @@ public class BmsTemplateInfoController extends BaseController {
/** /**
* *
*/ */
// @RequiresPermissions("system:templateInfo:list") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "查询申报模板信息列表", response = BmsTemplateInfo.class) @ApiOperation(value = "查询申报模板信息列表", response = BmsTemplateInfo.class)
public TableDataInfo list(BmsTemplateInfo bmsTemplateInfo) { public TableDataInfo list(BmsTemplateInfo bmsTemplateInfo) {
@ -55,7 +56,7 @@ public class BmsTemplateInfoController extends BaseController {
/** /**
* *
*/ */
// @RequiresPermissions("system:templateInfo:list") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping("/allList") @GetMapping("/allList")
@ApiOperation(value = "新增项目时查询所有模板信息", response = BmsTemplateInfoQueryVo.class) @ApiOperation(value = "新增项目时查询所有模板信息", response = BmsTemplateInfoQueryVo.class)
public AjaxResult allList(BmsTemplateInfo bmsTemplateInfo) { public AjaxResult allList(BmsTemplateInfo bmsTemplateInfo) {
@ -67,7 +68,7 @@ public class BmsTemplateInfoController extends BaseController {
/** /**
* *
*/ */
// @RequiresPermissions("system:templateInfo:export") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "申报模板信息", businessType = BusinessType.EXPORT) @Log(title = "申报模板信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, BmsTemplateInfo bmsTemplateInfo) { public void export(HttpServletResponse response, BmsTemplateInfo bmsTemplateInfo) {
@ -76,7 +77,7 @@ public class BmsTemplateInfoController extends BaseController {
util.exportExcel(response, list, "申报模板信息数据"); util.exportExcel(response, list, "申报模板信息数据");
} }
// @RequiresPermissions("system:templateInfo:exportTemplate") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "导出模板表单", businessType = BusinessType.EXPORT) @Log(title = "导出模板表单", businessType = BusinessType.EXPORT)
@GetMapping(value = "/exportTemplate/{id}") @GetMapping(value = "/exportTemplate/{id}")
public void exportTemplate(HttpServletRequest request, HttpServletResponse response,@PathVariable("id")Long id){ public void exportTemplate(HttpServletRequest request, HttpServletResponse response,@PathVariable("id")Long id){
@ -86,7 +87,7 @@ public class BmsTemplateInfoController extends BaseController {
/** /**
* *
*/ */
// @RequiresPermissions("system:templateInfo:query") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) { public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bmsTemplateInfoService.selectBmsTemplateInfoById(id)); return success(bmsTemplateInfoService.selectBmsTemplateInfoById(id));
@ -95,7 +96,7 @@ public class BmsTemplateInfoController extends BaseController {
/** /**
* *
*/ */
// @RequiresPermissions("system:templateInfo:add") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "申报模板信息", businessType = BusinessType.INSERT) @Log(title = "申报模板信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody BmsTemplateInfo bmsTemplateInfo) { public AjaxResult add(@RequestBody BmsTemplateInfo bmsTemplateInfo) {
@ -105,7 +106,7 @@ public class BmsTemplateInfoController extends BaseController {
/** /**
* *
*/ */
// @RequiresPermissions("system:templateInfo:edit") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "申报模板信息", businessType = BusinessType.UPDATE) @Log(title = "申报模板信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) { public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) {
@ -115,7 +116,7 @@ public class BmsTemplateInfoController extends BaseController {
/** /**
* *
*/ */
// @RequiresPermissions("system:templateInfo:remove") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "申报模板信息", businessType = BusinessType.DELETE) @Log(title = "申报模板信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) {

@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses; import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -39,7 +40,7 @@ public class BmsTemplateRecordController extends BaseController {
/** /**
* 线 * 线
*/ */
// @RequiresPermissions("system:templateRecord:list") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "查询在线模板记录列表",response = BmsTemplateRecordQueryVo.class) @ApiOperation(value = "查询在线模板记录列表",response = BmsTemplateRecordQueryVo.class)
public AjaxResult list(Page<BmsTemplateRecordQueryVo> page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { public AjaxResult list(Page<BmsTemplateRecordQueryVo> page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
@ -51,6 +52,7 @@ public class BmsTemplateRecordController extends BaseController {
* @param bmsTemplateQueryDto * @param bmsTemplateQueryDto
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "企业端选择表单模板列表") @ApiOperation(value = "企业端选择表单模板列表")
@GetMapping("/templateNameList") @GetMapping("/templateNameList")
public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){ public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){
@ -64,6 +66,7 @@ public class BmsTemplateRecordController extends BaseController {
* @param bmsTemplateRecordUpdateDto * @param bmsTemplateRecordUpdateDto
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "补录") @ApiOperation(value = "补录")
@PostMapping ("/supplementation") @PostMapping ("/supplementation")
public AjaxResult supplementation(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) { public AjaxResult supplementation(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
@ -73,7 +76,7 @@ public class BmsTemplateRecordController extends BaseController {
/** /**
* 线 * 线
*/ */
// @RequiresPermissions("system:templateRecord:export") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "在线模板", businessType = BusinessType.EXPORT) @Log(title = "在线模板", businessType = BusinessType.EXPORT)
@ApiOperation(value = "导出在线模板列表") @ApiOperation(value = "导出在线模板列表")
@PostMapping("/export") @PostMapping("/export")
@ -87,7 +90,7 @@ public class BmsTemplateRecordController extends BaseController {
* 线 * 线
*/ */
@ApiOperation(value = "获取在线模板详细信息") @ApiOperation(value = "获取在线模板详细信息")
// @RequiresPermissions("system:templateRecord:query") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) { public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bmsTemplateRecordService.selectBmsTemplateRecordById(id)); return success(bmsTemplateRecordService.selectBmsTemplateRecordById(id));
@ -97,7 +100,7 @@ public class BmsTemplateRecordController extends BaseController {
* 线 * 线
*/ */
@ApiOperation(value = "新增在线模板") @ApiOperation(value = "新增在线模板")
// @RequiresPermissions("system:templateRecord:add") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "在线模板", businessType = BusinessType.INSERT) @Log(title = "在线模板", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody BmsTemplateRecordAddDto bmsTemplateRecordAddDto) { public AjaxResult add(@RequestBody BmsTemplateRecordAddDto bmsTemplateRecordAddDto) {
@ -110,7 +113,7 @@ public class BmsTemplateRecordController extends BaseController {
* 线 * 线
*/ */
@ApiOperation(value = "修改在线模板") @ApiOperation(value = "修改在线模板")
// @RequiresPermissions("system:templateRecord:edit") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "在线模板", businessType = BusinessType.UPDATE) @Log(title = "在线模板", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) { public AjaxResult edit(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
@ -121,7 +124,7 @@ public class BmsTemplateRecordController extends BaseController {
* 线 * 线
*/ */
@ApiOperation(value = "删除在线模板") @ApiOperation(value = "删除在线模板")
// @RequiresPermissions("system:templateRecord:remove") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "在线模板", businessType = BusinessType.DELETE) @Log(title = "在线模板", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) {

@ -1,7 +1,9 @@
package com.ruoyi.jjh.declaration.entity; package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
@ -32,13 +34,42 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
/**
*
*/
private Integer multiple;
/**
*
*/
@ApiModelProperty("源主键")
@JSONField(name = "源主键")
@Excel(name = "源主键")
private String ywid;
/**
* org
*/
@ApiModelProperty("源表org")
@JSONField(name = "源表org")
@Excel(name = "源表org")
private String org;
/** /**
* *
*/ */
@ApiModelProperty("单位名称") @ApiModelProperty("企业名称")
@JSONField(name = "单位名称") @JSONField(name = "企业名称")
@Excel(name = "单位名称") @Excel(name = "企业名称")
private String enterpriseName; private String qymc;
/**
*
*/
@ApiModelProperty("标识证号")
@JSONField(name = "标识证号")
@Excel(name = "标识证号")
private String bszh;
/** /**
* *
@ -46,64 +77,103 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
@ApiModelProperty("统一社会信用代码") @ApiModelProperty("统一社会信用代码")
@JSONField(name = "统一社会信用代码") @JSONField(name = "统一社会信用代码")
@Excel(name = "统一社会信用代码") @Excel(name = "统一社会信用代码")
private String creditCode; private String tyshxydm;
/**
*
*/
@ApiModelProperty("企业注册号")
@JSONField(name = "企业注册号")
@Excel(name = "企业注册号")
private String qyzch;
/** /**
* *
*/ */
@ApiModelProperty("法定代表人") @ApiModelProperty("组织机构代码")
@JSONField(name = "法定代表人") @JSONField(name = "组织机构代码")
@Excel(name = "法定代表人") @Excel(name = "组织机构代码")
private String legalEntity; private String zzjgdm;
/** /**
* *
*/ */
@ApiModelProperty("经营状态") @ApiModelProperty("经济类型代码")
@JSONField(name = "经营状态") @JSONField(name = "经济类型代码")
@Excel(name = "经营状态") @Excel(name = "经济类型代码")
private String businessStatus; private String jjlxdm;
/** /**
* *
*/ */
@ApiModelProperty("成立日期") @ApiModelProperty("经济类型名称")
@JSONField(name = "成立日期") @JSONField(name = "经济类型名称")
@Excel(name = "成立日期") @Excel(name = "经济类型名称")
private String establishDate; private String jjlxmc;
/** /**
* *
*/ */
@ApiModelProperty("注册资本") @ApiModelProperty("企业类型代码")
@JSONField(name = "注册资本") @JSONField(name = "企业类型代码")
@Excel(name = "注册资本") @Excel(name = "企业类型代码")
private String registeredCapital; private String qylxdm;
/** /**
* *
*/ */
@ApiModelProperty("企业类型") @ApiModelProperty("企业类型名称")
@JSONField(name = "企业类型") @JSONField(name = "企业类型名称")
@Excel(name = "企业类型") @Excel(name = "企业类型名称")
private String enterpriseType; private String qylxmc;
/** /**
* *
*/ */
@ApiModelProperty("所属行业") @ApiModelProperty("注册资金")
@JSONField(name = "所属行业") @JSONField(name = "注册资金")
@Excel(name = "所属行业") @Excel(name = "注册资金")
private String industry; private String zczj;
/** /**
* *
*/ */
@ApiModelProperty("组织机构代码") @ApiModelProperty("注册资本币种")
@JSONField(name = "组织机构代码") @JSONField(name = "注册资本币种")
@Excel(name = "组织机构代码") @Excel(name = "注册资本币种")
private String institutionCode; private String zczbbz;
/**
*
*/
@ApiModelProperty("注册类型")
@JSONField(name = "注册类型")
@Excel(name = "注册类型")
private String zclx;
/**
*
*/
@ApiModelProperty("经营范围")
@JSONField(name = "经营范围")
@Excel(name = "经营范围")
private String jyfw;
/**
*
*/
@ApiModelProperty("经营或营业起始日期")
@JSONField(name = "经营或营业起始日期")
@Excel(name = "经营或营业起始日期")
private String jyhyyqsrq;
/**
*
*/
@ApiModelProperty("经营或营业截止日期")
@JSONField(name = "经营或营业截止日期")
@Excel(name = "经营或营业截止日期")
private String jyhyyjzrq;
/** /**
* *
@ -111,77 +181,207 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
@ApiModelProperty("行业代码") @ApiModelProperty("行业代码")
@JSONField(name = "行业代码") @JSONField(name = "行业代码")
@Excel(name = "行业代码") @Excel(name = "行业代码")
private String industryCode; private String hydm;
/** /**
* *
*/ */
@ApiModelProperty("登记注册统计类别") @ApiModelProperty("行业名称")
@JSONField(name = "登记注册统计类别") @JSONField(name = "行业名称")
@Excel(name = "登记注册统计类别") @Excel(name = "行业名称")
private String statisticalCategories; private String hymc;
/** /**
* *
*/ */
@ApiModelProperty("参保人数") @ApiModelProperty("行业门类")
@JSONField(name = "参保人数") @JSONField(name = "行业门类")
@Excel(name = "参保人数") @Excel(name = "行业门类")
private String visitorsNum; private String hyml;
/** /**
* *
*/ */
@ApiModelProperty("曾用名") @ApiModelProperty("产业类型")
@JSONField(name = "曾用名") @JSONField(name = "产业类型")
@Excel(name = "曾用名") @Excel(name = "产业类型")
private String formerName; private String cylx;
/** /**
* *
*/ */
@ApiModelProperty("注册地址") @ApiModelProperty("企业住所")
@JSONField(name = "注册地址") @JSONField(name = "企业住所")
@Excel(name = "注册地址") @Excel(name = "企业住所")
private String enrollAddress; private String qyzs;
/**
*
*/
@ApiModelProperty("经营场所")
@JSONField(name = "经营场所")
@Excel(name = "经营场所")
private String jycs;
/** /**
* *
*/ */
@ApiModelProperty("注册类型") @ApiModelProperty("经营场所行政区划")
@JSONField(name = "注册类型") @JSONField(name = "经营场所行政区划")
@Excel(name = "注册类型") @Excel(name = "经营场所行政区划")
private String enrollType; private String jycsxzqh;
/** /**
* *
*/ */
@ApiModelProperty("经营范围") @ApiModelProperty("邮政编码")
@JSONField(name = "经营范围") @JSONField(name = "邮政编码")
@Excel(name = "经营范围") @Excel(name = "邮政编码")
private String business; private String yzbm;
// /** /**
// * 联系人 *
// */ */
// @JSONField(name = "联系人") @ApiModelProperty("成立日期")
// @Excel(name = "联系人") @JSONField(name = "成立日期")
// private String contacts; @Excel(name = "成立日期")
// private String clrq;
// /**
// * 联系人电话 /**
// */ *
// @JSONField(name = "联系人电话") */
// @Excel(name = "联系人电话") @ApiModelProperty("信用等级")
// private String contactsNumber; @JSONField(name = "信用等级")
// @Excel(name = "信用等级")
// /** private String xydj;
// * 企业地址
// */ /**
// @JSONField(name = "企业地址") *
// @Excel(name = "企业地址") */
// private String address; @ApiModelProperty("企业规模")
@JSONField(name = "企业规模")
@Excel(name = "企业规模")
private String qygm;
/**
*
*/
@ApiModelProperty("法定代表人姓名")
@JSONField(name = "法定代表人姓名")
@Excel(name = "法定代表人姓名")
private String fddbrxm;
/**
*
*/
@ApiModelProperty("法定代表人证件号码")
@JSONField(name = "法定代表人证件号码")
@Excel(name = "法定代表人证件号码")
private String fddbrzjhm;
/**
*
*/
@ApiModelProperty("登记机关")
@JSONField(name = "登记机关")
@Excel(name = "登记机关")
private String djjg;
/**
*
*/
@ApiModelProperty("核准日期")
@JSONField(name = "核准日期")
@Excel(name = "核准日期")
private String hzrq;
/**
*
*/
@ApiModelProperty("经营状态")
@JSONField(name = "经营状态")
@Excel(name = "经营状态")
private String jyzt;
/**
*
*/
@ApiModelProperty("状态日期")
@JSONField(name = "状态日期")
@Excel(name = "状态日期")
private String ztrq;
/**
*
*/
@ApiModelProperty("注销日期")
@JSONField(name = "注销日期")
@Excel(name = "注销日期")
private String zxrq;
/**
*
*/
@ApiModelProperty("吊销日期")
@JSONField(name = "吊销日期")
@Excel(name = "吊销日期")
private String dxrq;
/**
*
*/
@ApiModelProperty("联系电话")
@JSONField(name = "联系电话")
@Excel(name = "联系电话")
private String lxdh;
/**
*
*/
@ApiModelProperty("是否园区内")
@JSONField(name = "是否园区内")
@Excel(name = "是否园区内")
private String sfyqn;
/**
*
*/
@ApiModelProperty("操作标识")
@JSONField(name = "操作标识")
@Excel(name = "操作标识")
private String dwOperation;
/**
*
*/
@ApiModelProperty("入库时间")
@JSONField(name = "入库时间")
@Excel(name = "入库时间")
private String dwTimestamp;
/**
*
*/
@ApiModelProperty("代理键")
@JSONField(name = "代理键")
@Excel(name = "代理键")
private String dwAgencykey;
/**
*
*/
@ApiModelProperty("来源机构")
@JSONField(name = "来源机构")
@Excel(name = "来源机构")
private String dwLyjg;
/**
*
*/
@ApiModelProperty("来源表名")
@JSONField(name = "来源表名")
@Excel(name = "来源表名")
private String dwLyb;
/** /**
* 01 * 01
@ -192,4 +392,5 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
private Long isDeleted; private Long isDeleted;
} }

@ -1,8 +1,10 @@
package com.ruoyi.jjh.declaration.mapper; package com.ruoyi.jjh.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -13,53 +15,22 @@ import java.util.List;
* @date 2023-08-25 * @date 2023-08-25
*/ */
public interface BmsEnterpriseBasicInfoMapper extends BaseMapper<BmsEnterpriseBasicInfo> { public interface BmsEnterpriseBasicInfoMapper extends BaseMapper<BmsEnterpriseBasicInfo> {
/**
*
*
* @param id
* @return
*/
public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id);
/** /**
* *
* *
* @param bmsEnterpriseBasicInfo * @param bmsEnterpriseBasicInfo
* @return * @return
*/ */
public List<BmsEnterpriseBasicInfo> selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); public Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page,@Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/**
*
*
* @param bmsEnterpriseBasicInfo
* @return
*/
public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/** /**
* *
* *
* @param bmsEnterpriseBasicInfo * @param bmsEnterpriseBasicInfo
* @return * @return
*/
public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/**
*
*
* @param id
* @return
*/
public int deleteBmsEnterpriseBasicInfoById(Long id);
/**
*
*
* @param ids
* @return
*/ */
public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids); List<BmsEnterpriseBasicInfo> page(@Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/** /**
* *

@ -1,15 +1,28 @@
package com.ruoyi.jjh.declaration.regular; package com.ruoyi.jjh.declaration.regular;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.service.JContactsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
/** /**
@ -21,6 +34,13 @@ import java.util.List;
@Configuration @Configuration
@EnableScheduling @EnableScheduling
public class TimeChange { public class TimeChange {
@Value("${enterpriseUrl}")
private String enterpriseUrl;
@Value("${isTiming}")
private Boolean isTiming;
/** /**
* *
*/ */
@ -33,6 +53,17 @@ public class TimeChange {
@Resource @Resource
private IBmsTemplateRecordService bmsTemplateRecordService; private IBmsTemplateRecordService bmsTemplateRecordService;
/**
*
*/
@Resource
private JContactsService jContactsService;
/**
*
*/
@Autowired
private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService;
/** /**
* *
@ -52,23 +83,28 @@ public class TimeChange {
} }
bmsTemplateInfoService.updateBatchById(list); bmsTemplateInfoService.updateBatchById(list);
} }
public void getTime(BmsTemplateRecord items){
public void getTime(BmsTemplateRecord items) {
LocalDate currentDate = LocalDate.now(); LocalDate currentDate = LocalDate.now();
LocalDate startDate = LocalDate.of(items.getStartTime().getYear(), items.getStartTime().getMonth(), items.getStartTime().getDayOfMonth()); LocalDate startDate = LocalDate.of(items.getStartTime().getYear(), items.getStartTime().getMonth(), items.getStartTime().getDayOfMonth());
LocalDate endDate = LocalDate.of(items.getEndTime().getYear(), items.getEndTime().getMonth(), items.getEndTime().getDayOfMonth()); LocalDate endDate = LocalDate.of(items.getEndTime().getYear(), items.getEndTime().getMonth(), items.getEndTime().getDayOfMonth());
if(currentDate.isBefore(startDate)){ if (currentDate.isBefore(startDate)) {
items.setStatus(0); items.setStatus(0);
} }
if(currentDate.isAfter(endDate)){ if (currentDate.isAfter(endDate)) {
items.setStatus(1); items.setStatus(1);
} }
if (currentDate.equals(startDate)||currentDate.equals(endDate)) { if (currentDate.equals(startDate) || currentDate.equals(endDate)) {
items.setStatus(2); items.setStatus(2);
} }
if (currentDate.isAfter(startDate) && currentDate.isBefore(endDate)) { if (currentDate.isAfter(startDate) && currentDate.isBefore(endDate)) {
items.setStatus(2); items.setStatus(2);
} }
} }
/**
* 线
*/
@Scheduled(cron = "1 0 0 * * *") @Scheduled(cron = "1 0 0 * * *")
private void templateRecordChange() { private void templateRecordChange() {
List<BmsTemplateRecord> list = bmsTemplateRecordService.list(); List<BmsTemplateRecord> list = bmsTemplateRecordService.list();
@ -77,4 +113,80 @@ public class TimeChange {
} }
bmsTemplateRecordService.updateBatchById(list); bmsTemplateRecordService.updateBatchById(list);
} }
/**
* -
*/
@Scheduled(cron = "0 0 2 * * *")
public void changeEnterpriseInfo() {
if (isTiming) {
List<BmsEnterpriseBasicInfo> list = bmsEnterpriseBasicInfoService.list();
List<BmsEnterpriseBasicInfo> allList = new ArrayList<>();
for (BmsEnterpriseBasicInfo items : list) {
String contacts = enterpriseUrl + "/645383/frjbxxtyshxydm";
HashMap<String, String> headers = new HashMap<>();//存放请求头,可以存放多个请求头
headers.put("Content-Type", "application/json;charset=utf-8");
//请求体
JSONObject jsonObject = new JSONObject();//存放参数
jsonObject.set("tyshxydm", items.getTyshxydm());
jsonObject.set("pageIndex", 0);
HttpResponse response = HttpRequest.post(contacts)
.addHeaders(headers)
.body(jsonObject.toString())
.execute();
if (response.getStatus() == 200) {
JSONObject jsonObj = JSONUtil.parseObj(response.body());
if ("200".equals(jsonObj.get("code"))) {
JSONObject reqData = JSONUtil.parseObj(jsonObj.get("data"));
JSONArray arr = reqData.getJSONArray("data"); // 直接获取数组,无需再次解析
int total = reqData.getInt("total"); // 只需解析一次total并转换为整数
if (total > 0) {
// 直接转换第一个元素为BmsEnterpriseBasicInfo对象
BmsEnterpriseBasicInfo res = JSONUtil.toBean(arr.getJSONObject(0).toString(), BmsEnterpriseBasicInfo.class);
res.setId(items.getId());
res.setMultiple(total);
allList.add(res);
}
}
}
}
bmsEnterpriseBasicInfoService.updateBatchById(allList);
}
}
/**
* -
*/
@Scheduled(cron = "0 0 3 * * *")
public void changeContacts() {
if (isTiming) {
List<BmsEnterpriseBasicInfo> list = bmsEnterpriseBasicInfoService.list();
for (BmsEnterpriseBasicInfo items : list) {
String contacts = enterpriseUrl + "/645383/qyllrytyshxydm";
HashMap<String, String> headers = new HashMap<>();//存放请求头,可以存放多个请求头
headers.put("Content-Type", "application/json;charset=utf-8");
//请求体
JSONObject jsonObject = new JSONObject();//存放参数
jsonObject.set("tyshxydm", items.getTyshxydm());
jsonObject.set("pageIndex", 0);
HttpResponse response = HttpRequest.post(contacts)
.addHeaders(headers)
.body(jsonObject.toString())
.execute();
if (response.getStatus() == 200) {
JSONObject jsonObj = JSONUtil.parseObj(response.body());
if ("200".equals(jsonObj.get("code"))) {
JSONObject reqData = JSONUtil.parseObj(jsonObj.get("data"));
JSONArray arr = JSONUtil.parseArray(reqData.get("data"));
List<JContacts> allList = new ArrayList<>();
for (Object o : arr) {
JContacts res = JSONUtil.toBean(o.toString(), JContacts.class);
allList.add(res);
}
jContactsService.saveOrUpdateBatch(allList);
}
}
}
}
}
} }

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.service; package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
@ -13,13 +14,7 @@ import java.util.List;
* @date 2023-08-25 * @date 2023-08-25
*/ */
public interface IBmsEnterpriseBasicInfoService extends IService<BmsEnterpriseBasicInfo> { public interface IBmsEnterpriseBasicInfoService extends IService<BmsEnterpriseBasicInfo> {
/**
*
*
* @param id
* @return
*/
public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id);
/** /**
* *
@ -27,39 +22,16 @@ public interface IBmsEnterpriseBasicInfoService extends IService<BmsEnterpriseBa
* @param bmsEnterpriseBasicInfo * @param bmsEnterpriseBasicInfo
* @return * @return
*/ */
public List<BmsEnterpriseBasicInfo> selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/**
*
*
* @param bmsEnterpriseBasicInfo
* @return
*/
public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/** /**
* *
* *
* @param bmsEnterpriseBasicInfo * @param bmsEnterpriseBasicInfo
* @return * @return
*/
public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/**
*
*
* @param ids
* @return
*/ */
public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids); List<BmsEnterpriseBasicInfo> page( BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/**
*
*
* @param id
* @return
*/
public int deleteBmsEnterpriseBasicInfoById(Long id);
List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest); List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest);
/** /**

@ -138,7 +138,7 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo(); BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo();
//做大做强对象JSON //做大做强对象JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -146,7 +146,7 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
jsonMap.put("fileJson","{" + jsonMap.put("fileJson","{" +
'"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' + '"' + "企业近3年发展情况及未来发展计划" + '"' + ":" + '"' + p1.getDevelopmentPlan() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -118,7 +118,7 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward(); BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward();
//品牌打造奖补JSON //品牌打造奖补JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -126,7 +126,7 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' + '"' + "证明材料" + '"' + ":" + '"' + p1.getEvidence() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -117,7 +117,7 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward(); BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward();
//载体建设奖补JSON //载体建设奖补JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -127,7 +127,7 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
'"' + "项目工商登记许可" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ','+ '"' + "项目工商登记许可" + '"' + ":" + '"' + p1.getBusinessLicense() + '"' + ','+
'"' + "消防验收报告" + '"' + ":" + '"' + p1.getFireReport() + '"' + '"' + "消防验收报告" + '"' + ":" + '"' + p1.getFireReport() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -118,7 +118,7 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement(); BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement();
//信用管理奖补JSON //信用管理奖补JSON
// String js3 = JSONObject.toJSONString(p1); // String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -128,7 +128,7 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
'"' + "资金使用说明" + '"' + ":" + '"' + p1.getUsesFunds() + '"' + ","+ '"' + "资金使用说明" + '"' + ":" + '"' + p1.getUsesFunds() + '"' + ","+
'"' + "项目专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + '"' + "项目专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -464,7 +464,7 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
// 统一信用代码、年份、申报类型 -- > 申报记录 --> // 统一信用代码、年份、申报类型 -- > 申报记录 -->
// 查询企业数据 // 查询企业数据
List<BmsEnterpriseBasicInfo> enterpriseInfoList = iBmsEnterpriseBasicInfoService.lambdaQuery().list(); List<BmsEnterpriseBasicInfo> enterpriseInfoList = iBmsEnterpriseBasicInfoService.lambdaQuery().list();
Map<String, BmsEnterpriseBasicInfo> enterpriseBasicMap = enterpriseInfoList.stream().collect(Collectors.toMap(BmsEnterpriseBasicInfo::getCreditCode, Function.identity())); Map<String, BmsEnterpriseBasicInfo> enterpriseBasicMap = enterpriseInfoList.stream().collect(Collectors.toMap(BmsEnterpriseBasicInfo::getTyshxydm, Function.identity()));
// 匹配企业 // 匹配企业
List<Long> enterpriseIdList = new ArrayList<>(); List<Long> enterpriseIdList = new ArrayList<>();

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.service.impl; package com.ruoyi.jjh.declaration.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
@ -19,16 +20,6 @@ import java.util.List;
@Service @Service
public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterpriseBasicInfoMapper,BmsEnterpriseBasicInfo> implements IBmsEnterpriseBasicInfoService { public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterpriseBasicInfoMapper,BmsEnterpriseBasicInfo> implements IBmsEnterpriseBasicInfoService {
/**
*
*
* @param id
* @return
*/
@Override
public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id) {
return baseMapper.selectBmsEnterpriseBasicInfoById(id);
}
/** /**
* *
@ -37,55 +28,21 @@ public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterprise
* @return * @return
*/ */
@Override @Override
public List<BmsEnterpriseBasicInfo> selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { public Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
return baseMapper.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo); return baseMapper.page(page,bmsEnterpriseBasicInfo);
}
/**
*
*
* @param bmsEnterpriseBasicInfo
* @return
*/
@Override
public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
bmsEnterpriseBasicInfo.setCreateTime(DateUtils.getNowDate());
return baseMapper.insertBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo);
} }
/** /**
* *
* *
* @param bmsEnterpriseBasicInfo * @param bmsEnterpriseBasicInfo
* @return * @return
*/
@Override
public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
bmsEnterpriseBasicInfo.setUpdateTime(DateUtils.getNowDate());
return baseMapper.updateBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo);
}
/**
*
*
* @param ids
* @return
*/ */
@Override @Override
public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids) { public List<BmsEnterpriseBasicInfo> page(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
return baseMapper.deleteBmsEnterpriseBasicInfoByIds(ids); return baseMapper.page(bmsEnterpriseBasicInfo);
} }
/**
*
*
* @param id
* @return
*/
@Override
public int deleteBmsEnterpriseBasicInfoById(Long id) {
return baseMapper.deleteBmsEnterpriseBasicInfoById(id);
}
@Override @Override
public List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) { public List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) {

@ -116,7 +116,7 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward(); BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward();
//5G+工业互联网奖补JSON //5G+工业互联网奖补JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -124,7 +124,7 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' + '"' + "证明材料" + '"' + ":" + '"' + p1.getMaterial() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -117,7 +117,7 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
BmsIntegrationIndustries p1 = declarationRecordsVo.getBmsIntegrationIndustries(); BmsIntegrationIndustries p1 = declarationRecordsVo.getBmsIntegrationIndustries();
//两业融合奖补申请JSON //两业融合奖补申请JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -133,7 +133,7 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
'"' + "验资报告" + '"' + ":" + '"' + p1.getCapitalVerificationReport()+ '"' + ","+ '"' + "验资报告" + '"' + ":" + '"' + p1.getCapitalVerificationReport()+ '"' + ","+
'"' + "其他证明材料" + '"' + ":" + '"' + p1.getOtherEvidence() + '"' + '"' + "其他证明材料" + '"' + ":" + '"' + p1.getOtherEvidence() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -121,7 +121,7 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
BmsLogisticsDevelopmentAward p1 = declarationRecordsVo.getBmsLogisticsDevelopmentAward(); BmsLogisticsDevelopmentAward p1 = declarationRecordsVo.getBmsLogisticsDevelopmentAward();
//物流发展奖补JSON //物流发展奖补JSON
// String js3 = JSONObject.toJSONString(p1); // String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -132,7 +132,7 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
'"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+ '"' + "企业投资项目备案通知书或核准批复文件" + '"' + ":" + '"' + p1.getFilingNotice() + '"' + ","+
'"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -116,7 +116,7 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward(); BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward();
//制造服务业有效投入奖补JSON //制造服务业有效投入奖补JSON
// String js3 = JSONObject.toJSONString(p1); // String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -127,7 +127,7 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
'"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+ '"' + "会计师事务所出具的企业申报项目购置设备情况的专项审计报告" + '"' + ":" + '"' + p1.getAuditReport() + '"' + ","+
'"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' + '"' + "会计师事务所出具的企业财务报表审计报告" + '"' + ":" + '"' + p1.getFinancialStatements() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -106,7 +106,7 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
BmsOutQuitProducts p1 = declarationRecordsVo.getBmsOutQuitProducts(); BmsOutQuitProducts p1 = declarationRecordsVo.getBmsOutQuitProducts();
//提交2024年度淘汰落后和退出低端低效产能装备清单json //提交2024年度淘汰落后和退出低端低效产能装备清单json
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -115,7 +115,7 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
'"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + p1.getSpecifics() + '"' + "," + '"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + p1.getSpecifics() + '"' + "," +
'"' + "其他相关情况说明" + '"' + ":" + '"' + p1.getOtherSpecifics() + '"'+ '"' + "其他相关情况说明" + '"' + ":" + '"' + p1.getOtherSpecifics() + '"'+
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -120,7 +120,7 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward(); BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward();
//平台建设奖补json //平台建设奖补json
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -128,7 +128,7 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' + '"' + "合作协议" + '"' + ":" + '"' + p1.getAgreement() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -142,7 +142,7 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo(); BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo();
//落户奖补对象JSON //落户奖补对象JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -153,7 +153,7 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
'"' + "营业执照" + '"' + ":" + '"' + p1.getOtherMaterials() + '"' + "," + '"' + "营业执照" + '"' + ":" + '"' + p1.getOtherMaterials() + '"' + "," +
'"' + "其他证明材料" + '"' + ":" + '"' + p1.getReport() + '"' + '"' + "其他证明材料" + '"' + ":" + '"' + p1.getReport() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -117,7 +117,7 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward(); BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward();
//场景开放奖补JSON //场景开放奖补JSON
String js3 = JSONObject.toJSONString(p1); String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode()); jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getTyshxydm());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName()); jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear()); jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId())); jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
@ -125,7 +125,7 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
jsonMap.put("fileJson", "{" + jsonMap.put("fileJson", "{" +
'"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' + '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + p1.getMaterial() + '"' +
"}"); "}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName()); jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getQymc());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId())); jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap; return jsonMap;
} }

@ -96,9 +96,9 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
@Override @Override
public List<BmsTemplateRecordQueryVo> selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto) { public List<BmsTemplateRecordQueryVo> selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto) {
Long enterpriseId = bmsTemplateQueryDto.getEnterpriseId(); Long enterpriseId = bmsTemplateQueryDto.getEnterpriseId();
BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = iBmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoById(enterpriseId); BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = iBmsEnterpriseBasicInfoService.getById(enterpriseId);
if (BeanUtil.isNotEmpty(bmsEnterpriseBasicInfo)) { if (BeanUtil.isNotEmpty(bmsEnterpriseBasicInfo)) {
bmsTemplateQueryDto.setCreditCode(bmsEnterpriseBasicInfo.getCreditCode()); bmsTemplateQueryDto.setCreditCode(bmsEnterpriseBasicInfo.getTyshxydm());
return baseMapper.selectBmsTemplateNameList(bmsTemplateQueryDto); return baseMapper.selectBmsTemplateNameList(bmsTemplateQueryDto);
} }
return null; return null;
@ -149,10 +149,10 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
for (BmsEnterpriseBasicInfo items : list) { for (BmsEnterpriseBasicInfo items : list) {
BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory(); BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory();
bms.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); bms.setTemplateRecordId(bmsTemplateRecordAddDto.getId());
bms.setEnterpriseName(items.getEnterpriseName()); bms.setEnterpriseName(items.getQymc());
bms.setCreditCode(items.getCreditCode()); bms.setCreditCode(items.getTyshxydm());
copyList.add(bms); copyList.add(bms);
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId()); getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getTyshxydm(), bmsTemplateRecordAddDto.getTemplateId());
} }
enterpriseDirectoryService.saveBatch(copyList); enterpriseDirectoryService.saveBatch(copyList);
} }
@ -232,10 +232,10 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
for (BmsEnterpriseBasicInfo items : list) { for (BmsEnterpriseBasicInfo items : list) {
BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory(); BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory();
bms.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId()); bms.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
bms.setEnterpriseName(items.getEnterpriseName()); bms.setEnterpriseName(items.getQymc());
bms.setCreditCode(items.getCreditCode()); bms.setCreditCode(items.getTyshxydm());
copyList.add(bms); copyList.add(bms);
getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, items.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId()); getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, items.getTyshxydm(), bmsTemplateRecordUpdateDto.getTemplateId());
} }
enterpriseDirectoryService.saveBatch(copyList); enterpriseDirectoryService.saveBatch(copyList);
} }
@ -308,8 +308,8 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
//将信息表的所有企业添加到名录表 //将信息表的所有企业添加到名录表
for (BmsEnterpriseBasicInfo x : allList) { for (BmsEnterpriseBasicInfo x : allList) {
BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory(); BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory();
bmsEnterpriseDirectory.setCreditCode(x.getCreditCode()); bmsEnterpriseDirectory.setCreditCode(x.getTyshxydm());
bmsEnterpriseDirectory.setEnterpriseName(x.getEnterpriseName()); bmsEnterpriseDirectory.setEnterpriseName(x.getQymc());
enterpriseDirectoryList.add(bmsEnterpriseDirectory); enterpriseDirectoryList.add(bmsEnterpriseDirectory);
} }
} }
@ -342,7 +342,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
} }
//根据信用代码去企业信息表里查找该企业,如果能找到并且该企业未填报过该模板 就添加企业id //根据信用代码去企业信息表里查找该企业,如果能找到并且该企业未填报过该模板 就添加企业id
LambdaQueryWrapper<BmsEnterpriseBasicInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BmsEnterpriseBasicInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getCreditCode, codeList); lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getTyshxydm, codeList);
return iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper); return iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper);
} }
} }

@ -110,7 +110,7 @@ public class CommonServiceImpl implements ICommonService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Long checkEnterprise(String creditCode, int templateRecordId) { public Long checkEnterprise(String creditCode, int templateRecordId) {
Long enterpriseId = 0L; Long enterpriseId = 0L;
BmsEnterpriseBasicInfo basicInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getCreditCode, creditCode)); BmsEnterpriseBasicInfo basicInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getTyshxydm, creditCode));
if (BeanUtil.isEmpty(basicInfo)) { if (BeanUtil.isEmpty(basicInfo)) {
throw new ServiceException("申请企业未入企业库!"); throw new ServiceException("申请企业未入企业库!");
} }
@ -126,7 +126,7 @@ public class CommonServiceImpl implements ICommonService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void checkDeclaration(String creditCode, int templateRecordId) { public void checkDeclaration(String creditCode, int templateRecordId) {
// check当前企业是否已经申请 // check当前企业是否已经申请
BmsEnterpriseBasicInfo enterpriseInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getCreditCode, creditCode)); BmsEnterpriseBasicInfo enterpriseInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getTyshxydm, creditCode));
// check 申请是否过期或者该申请是不限时的 // check 申请是否过期或者该申请是不限时的
BmsTemplateRecord templateRecord = iBmsTemplateRecordService.getById(templateRecordId); BmsTemplateRecord templateRecord = iBmsTemplateRecordService.getById(templateRecordId);
if (templateRecord.getStatus() == 0) { if (templateRecord.getStatus() == 0) {
@ -165,7 +165,7 @@ public class CommonServiceImpl implements ICommonService {
if (BeanUtil.isEmpty(basicInfo)) { if (BeanUtil.isEmpty(basicInfo)) {
throw new ServiceException("申请企业未入企业库!"); throw new ServiceException("申请企业未入企业库!");
} }
BmsEnterpriseDirectory enterpriseDirectory = bmsEnterpriseDirectoryService.getOne(Wrappers.lambdaQuery(BmsEnterpriseDirectory.class).eq(BmsEnterpriseDirectory::getCreditCode, basicInfo.getCreditCode()).eq(BmsEnterpriseDirectory::getTemplateRecordId, templateId)); BmsEnterpriseDirectory enterpriseDirectory = bmsEnterpriseDirectoryService.getOne(Wrappers.lambdaQuery(BmsEnterpriseDirectory.class).eq(BmsEnterpriseDirectory::getCreditCode, basicInfo.getTyshxydm()).eq(BmsEnterpriseDirectory::getTemplateRecordId, templateId));
if (BeanUtil.isEmpty(enterpriseDirectory)) { if (BeanUtil.isEmpty(enterpriseDirectory)) {
throw new ServiceException("申请企业不在企业名录中!"); throw new ServiceException("申请企业不在企业名录中!");
} }

@ -58,13 +58,13 @@ public class OpenInterfaceServiceImpl implements IOpenInterfaceService {
EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = new EnterpriseInfoTemplateVo(); EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = new EnterpriseInfoTemplateVo();
// 获取企业信息 // 获取企业信息
List<BmsEnterpriseBasicInfo> enterpriseList = iBmsEnterpriseBasicInfoService.lambdaQuery() List<BmsEnterpriseBasicInfo> enterpriseList = iBmsEnterpriseBasicInfoService.lambdaQuery()
.like(BmsEnterpriseBasicInfo::getCreditCode, creditCode).list(); .like(BmsEnterpriseBasicInfo::getTyshxydm, creditCode).list();
List<BmsEnterpriseDirectory> directoryList = new ArrayList<>(); List<BmsEnterpriseDirectory> directoryList = new ArrayList<>();
List<BmsTemplateRecord> templateRecordList = new ArrayList<>(); List<BmsTemplateRecord> templateRecordList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(enterpriseList)) { if (CollectionUtil.isNotEmpty(enterpriseList)) {
// 企业信息不为空,获取企业名录信息 // 企业信息不为空,获取企业名录信息
enterpriseInfoTemplateVo.setEnterpriseBasicList(enterpriseList); enterpriseInfoTemplateVo.setEnterpriseBasicList(enterpriseList);
List<String> creditCodeList = enterpriseList.stream().map(BmsEnterpriseBasicInfo::getCreditCode).collect(Collectors.toList()); List<String> creditCodeList = enterpriseList.stream().map(BmsEnterpriseBasicInfo::getTyshxydm).collect(Collectors.toList());
// 企业名录列表 // 企业名录列表
directoryList = iBmsEnterpriseDirectoryService.lambdaQuery().in(BmsEnterpriseDirectory::getCreditCode, creditCodeList).list(); directoryList = iBmsEnterpriseDirectoryService.lambdaQuery().in(BmsEnterpriseDirectory::getCreditCode, creditCodeList).list();
System.out.println(directoryList); System.out.println(directoryList);

@ -3,14 +3,13 @@ package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.ent.entity.JContacts; import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact; import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import com.ruoyi.jjh.ent.service.JContactsService; import com.ruoyi.jjh.ent.service.JContactsService;
import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -19,6 +18,7 @@ import java.util.Arrays;
/** /**
* ()j_contacts * ()j_contacts
*
* @author du * @author du
* @since 2024/5/13 9:56 * @since 2024/5/13 9:56
*/ */
@ -31,18 +31,29 @@ public class JContactsController extends BaseController {
private JContactsService jContactsService; private JContactsService jContactsService;
/** /**
* *
* *
* @param jContacts * @param jContacts
* @return * @return
*/ */
@ApiOperation(value = "分页查询所有数据", response = JContacts.class) @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "分页查询联络人数据", response = JContacts.class)
@GetMapping @GetMapping
public AjaxResult selectAll( JContacts jContacts) { public AjaxResult selectAll( JContactsRequest jContacts) {
if(jContacts.getCreditCode()==null || jContacts.getCreditCode().isEmpty()){ // 获取当前登录用户是否是企业端
throw new ServiceException("该企业的信用代码不可为空"); boolean admin = false;
boolean b = false;
String str = null;
try {
admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
b = SecurityUtils.hasRole("ent");
str = SecurityUtils.getUsername();
} catch (Exception ignored) {
}
if (!admin && b) {
jContacts.setTyshxydm(str);
} }
return success(jContactsService.page(jContacts)); return success(jContactsService.page( jContacts));
} }
@ -52,45 +63,12 @@ public class JContactsController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "通过主键查询单条数据", response = JContacts.class) @ApiOperation(value = "通过主键查询单条数据", response = JContacts.class)
@GetMapping("{id}") @GetMapping("{id}")
public AjaxResult selectOne(@PathVariable Serializable id) { public AjaxResult selectOne(@PathVariable Serializable id) {
return success(jContactsService.getById(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)));
}
} }

@ -3,11 +3,14 @@ package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact; import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import com.ruoyi.jjh.ent.service.JEnterpriseContactService; import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -34,9 +37,24 @@ public class JEnterpriseContactController extends BaseController {
* @param jEnterpriseContactRequest * @param jEnterpriseContactRequest
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "分页查询所有数据", response = JEnterpriseContact.class) @ApiOperation(value = "分页查询所有数据", response = JEnterpriseContact.class)
@GetMapping @GetMapping
public AjaxResult selectAll(Page<JEnterpriseContact> page, JEnterpriseContactRequest jEnterpriseContactRequest) { public AjaxResult selectAll(Page<JEnterpriseContact> page, JEnterpriseContactRequest jEnterpriseContactRequest) {
// 获取当前登录用户是否是企业端
boolean admin = false;
boolean b = false;
SysUser str = null;
try {
admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
b = SecurityUtils.hasRole("ent");
str =SecurityUtils.getLoginUser().getUser();
} catch (Exception ignored) {
}
if(!admin && b){
jEnterpriseContactRequest.setEnterpriseName(str.getNickName());
jEnterpriseContactRequest.setEnterpriseCode(str.getUserName());
}
return success(jEnterpriseContactService.page(page, jEnterpriseContactRequest)); return success(jEnterpriseContactService.page(page, jEnterpriseContactRequest));
} }
@ -47,6 +65,7 @@ public class JEnterpriseContactController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "通过主键查询单条数据", response = JEnterpriseContact.class) @ApiOperation(value = "通过主键查询单条数据", response = JEnterpriseContact.class)
@GetMapping("{id}") @GetMapping("{id}")
public AjaxResult selectOne(@PathVariable Serializable id) { public AjaxResult selectOne(@PathVariable Serializable id) {
@ -59,6 +78,7 @@ public class JEnterpriseContactController extends BaseController {
* @param jEnterpriseContact * @param jEnterpriseContact
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "新增数据") @ApiOperation(value = "新增数据")
@PostMapping @PostMapping
public AjaxResult insert(@RequestBody JEnterpriseContact jEnterpriseContact) { public AjaxResult insert(@RequestBody JEnterpriseContact jEnterpriseContact) {
@ -71,6 +91,7 @@ public class JEnterpriseContactController extends BaseController {
* @param jEnterpriseContact * @param jEnterpriseContact
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "修改数据") @ApiOperation(value = "修改数据")
@PutMapping @PutMapping
public AjaxResult update(@RequestBody JEnterpriseContact jEnterpriseContact) { public AjaxResult update(@RequestBody JEnterpriseContact jEnterpriseContact) {
@ -83,6 +104,7 @@ public class JEnterpriseContactController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "删除数据") @ApiOperation(value = "删除数据")
@DeleteMapping @DeleteMapping
public AjaxResult delete(@RequestParam("id") Long[] id) { public AjaxResult delete(@RequestParam("id") Long[] id) {

@ -9,6 +9,7 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.regular.TimeChange;
import com.ruoyi.jjh.ent.entity.JMemorandum; import com.ruoyi.jjh.ent.entity.JMemorandum;
import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest; import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest;
import com.ruoyi.jjh.ent.service.JMemorandumService; import com.ruoyi.jjh.ent.service.JMemorandumService;
@ -46,6 +47,9 @@ public class JMemorandumController extends BaseController {
@Resource @Resource
private JMemorandumService jMemorandumService; private JMemorandumService jMemorandumService;
@Resource
private TimeChange ts;
/** /**
* *
* *
@ -59,6 +63,23 @@ public class JMemorandumController extends BaseController {
return success(jMemorandumService.page(page, jMemorandumRequest)); return success(jMemorandumService.page(page, jMemorandumRequest));
} }
@ApiOperation(value = "定时更新法人库-法人基本信息(统一社会信用代码)")
@GetMapping("/getEnterpriseInfo")
public AjaxResult selectAll2() {
ts.changeEnterpriseInfo();
return success();
}
@ApiOperation(value = "定时更新法人库-企业联络人员(统一社会信用代码)")
@GetMapping("/getChangeContacts")
public AjaxResult selectAll1() {
ts.changeContacts();
return AjaxResult.success();
}
/** /**
* IDIDID * IDIDID
* *

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.poi.ProjectExcelUtil; import com.ruoyi.common.utils.poi.ProjectExcelUtil;
import com.ruoyi.common.utils.poi.ProjectValueUtil; import com.ruoyi.common.utils.poi.ProjectValueUtil;
@ -16,6 +17,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -40,6 +42,27 @@ public class JProjectController extends BaseController {
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
// /**
// * 改变没有信用代码的项目
// * @return
// */
// @ApiOperation(value = "改变没有信用代码的项目", response = JProject.class)
// @GetMapping("/changeTyshxydm")
// public AjaxResult changeTyshxydm() {
// return success(jProjectService.changeTyshxydm());
// }
// /**
// * 改变项目中的英文括号
// *
// * @return
// */
// @ApiOperation(value = "改变项目中的英文括号", response = JProject.class)
// @GetMapping("/changeKh")
// public AjaxResult changeKh() {
// return success(jProjectService.changeKh());
// }
/** /**
* *
* *
@ -50,6 +73,19 @@ public class JProjectController extends BaseController {
@ApiOperation(value = "分页查询项目", response = JProject.class) @ApiOperation(value = "分页查询项目", response = JProject.class)
@GetMapping @GetMapping
public AjaxResult selectPage(Page<JProject> page, JProject jProject) { public AjaxResult selectPage(Page<JProject> page, JProject jProject) {
// 获取当前登录用户是否是企业端
boolean b = false;
boolean admin = false;
String str = null;
try {
admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
b = SecurityUtils.hasRole("ent");
str = SecurityUtils.getUsername();
} catch (Exception ignored) {
}
if (!admin && b) {
jProject.setCreditCode(str);
}
return success(jProjectService.page(page, jProject)); return success(jProjectService.page(page, jProject));
} }
@ -59,6 +95,7 @@ public class JProjectController extends BaseController {
* @param name * @param name
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "作业台查询所有项目(政务端)", response = JProject.class) @ApiOperation(value = "作业台查询所有项目(政务端)", response = JProject.class)
@GetMapping("/selectAll") @GetMapping("/selectAll")
public AjaxResult selectAll(@RequestParam String name) { public AjaxResult selectAll(@RequestParam String name) {
@ -97,6 +134,7 @@ public class JProjectController extends BaseController {
* @param jProject * @param jProject
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin')")
@ApiOperation(value = "新增项目") @ApiOperation(value = "新增项目")
@PostMapping @PostMapping
public AjaxResult insert(@RequestBody JProject jProject) { public AjaxResult insert(@RequestBody JProject jProject) {
@ -130,6 +168,7 @@ public class JProjectController extends BaseController {
/** /**
* excel * excel
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
@ApiOperation(value = "导入已有的excel项目数据") @ApiOperation(value = "导入已有的excel项目数据")
@PostMapping(value = "/export", consumes = "multipart/form-data") @PostMapping(value = "/export", consumes = "multipart/form-data")
public AjaxResult export(@RequestPart("file") MultipartFile file) throws Exception { public AjaxResult export(@RequestPart("file") MultipartFile file) throws Exception {
@ -148,6 +187,7 @@ public class JProjectController extends BaseController {
/** /**
* excel * excel
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
@ApiOperation(value = "导入下载的excel模板和参数项目数据") @ApiOperation(value = "导入下载的excel模板和参数项目数据")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "projectClassify", value = "项目分类", required = true), @ApiImplicitParam(name = "projectClassify", value = "项目分类", required = true),

@ -0,0 +1,100 @@
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.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.JSmartReminders;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import com.ruoyi.jjh.ent.service.JSmartRemindersService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.Arrays;
/**
* j_smart_reminders
* @author du
* @since 2024/7/1 13:33
*/
@RestController
@RequestMapping("/jjh/jSmartReminders")
@Api(tags = "智能提醒")
public class JSmartRemindersController extends BaseController {
@Resource
private JSmartRemindersService jSmartRemindersService;
/**
*
*
* @param page
* @param jSmartReminders
* @return
*/
// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "分页查询所有数据", response = JSmartReminders.class)
@GetMapping
public AjaxResult selectAll(Page<JSmartReminders> page, JSmartReminders jSmartReminders) {
return success(jSmartRemindersService.page(page, jSmartReminders));
}
/**
*
*
* @param id
* @return
*/
// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "通过主键查询单条数据", response = JSmartReminders.class)
@GetMapping("{id}")
public AjaxResult selectOne(@PathVariable Serializable id) {
return success(jSmartRemindersService.getById(id));
}
/**
*
*
* @param jSmartReminders
* @return
*/
// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "新增数据")
@PostMapping
public AjaxResult insert(@RequestBody JSmartReminders jSmartReminders) {
return success(jSmartRemindersService.add(jSmartReminders));
}
/**
*
*
* @param jSmartReminders
* @return
*/
// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "修改数据")
@PutMapping
public AjaxResult update(@RequestBody JSmartReminders jSmartReminders) {
return success(jSmartRemindersService.updateById(jSmartReminders));
}
/**
*
*
* @param id
* @return
*/
// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "删除数据")
@DeleteMapping
public AjaxResult delete(@RequestParam("id") Long id) {
return success(jSmartRemindersService.removeById(id));
}
}

@ -19,59 +19,149 @@ import lombok.Data;
public class JContacts extends BaseInfoEntity { public class JContacts extends BaseInfoEntity {
/** /**
* Id *
*/ */
@TableId(value = "id", type = IdType.AUTO) @TableId
@ApiModelProperty("Id") @ApiModelProperty("代理键")
private Long id; private String dwAgencykey;
/** /**
* * id
*/ */
@Excel(name = "联系人姓名") @JSONField(serialize=false)
@ApiModelProperty("联系人姓名") @TableField(fill = FieldFill.INSERT)
private String contactName; private Long createId;
/** /**
* * id
*/ */
@Excel(name = "公司职务") @JSONField(serialize=false)
@ApiModelProperty("公司职务") @TableField(fill = FieldFill.INSERT_UPDATE)
private String firmOffice; private Long updateId;
/** /**
* *
*/ */
@Excel(name = "企业统一社会信用代码") @Excel(name = "企业名称")
@ApiModelProperty("企业统一社会信用代码") @ApiModelProperty("企业名称")
private String creditCode; private String qymc;
/** /**
* *
*/ */
@Excel(name = "手机号") @Excel(name = "标识证号")
@ApiModelProperty("手机号") @ApiModelProperty("标识证号")
private String phone; private String bszh;
/** /**
* *
*/ */
@Excel(name = "邮箱") @Excel(name = "统一社会信用代码")
@ApiModelProperty("邮箱") @ApiModelProperty("统一社会信用代码")
private String email; private String tyshxydm;
/**
*
*/
@Excel(name = "组织机构代码")
@ApiModelProperty("组织机构代码")
private String zzjgdm;
/** /**
* id *
*/ */
@JSONField(serialize=false) @Excel(name = "联络人姓名")
@TableField(fill = FieldFill.INSERT) @ApiModelProperty("联络人姓名")
private Long createId; private String llrxm;
/** /**
* id *
*/ */
@JSONField(serialize=false) @Excel(name = "联络人职务")
@TableField(fill = FieldFill.UPDATE) @ApiModelProperty("联络人职务")
private Long updateId; private String llrzw;
/**
*
*/
@Excel(name = "电子邮箱")
@ApiModelProperty("电子邮箱")
private String dzyx;
/**
*
*/
@Excel(name = "移动电话")
@ApiModelProperty("移动电话")
private String yddh;
/**
*
*/
@Excel(name = "固定电话")
@ApiModelProperty("固定电话")
private String gddh;
/**
*
*/
@Excel(name = "联络人编号")
@ApiModelProperty("联络人编号")
private String llrbh;
/**
*
*/
@Excel(name = "默认法人统一社会用代码")
@ApiModelProperty("默认法人统一社会用代码")
private String dwExtend1;
/**
*
*/
@Excel(name = "法人注册号")
@ApiModelProperty("法人注册号")
private String dwExtend2;
/**
*
*/
@Excel(name = "法人组织机构代码")
@ApiModelProperty("法人组织机构代码")
private String dwExtend3;
/**
*
*/
@Excel(name = "操作标识")
@ApiModelProperty("操作标识")
private String dwOperation;
/**
*
*/
@Excel(name = "入库时间")
@ApiModelProperty("入库时间")
private String dwTimestamp;
/**
*
*/
@Excel(name = "来源机构")
@ApiModelProperty("来源机构")
private String dwLyjg;
/**
*
*/
@Excel(name = "来源表名")
@ApiModelProperty("来源表名")
private String dwLyb;
} }

@ -0,0 +1,91 @@
package com.ruoyi.jjh.ent.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
/**
* j_smart_reminders
* @author du
* @since 2024/7/1 13:33
*/
@Data
@ApiModel("智能提醒")
@TableName(value = "j_smart_reminders")
public class JSmartReminders extends BaseInfoEntity {
/**
* Id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty("Id")
private Long id;
/**
*
*/
@NotNull
@ApiModelProperty("规则名称")
private String rulesName;
/**
* 1. 2
*/
@NotNull
@ApiModelProperty("提醒对象 1.企业用户 2政务用户")
private Integer alertRecipients;
/**
* 1. 2.
*/
@NotNull
@ApiModelProperty("提醒方式 1.定期提醒 2.不定期提醒")
private Integer alertManner;
/**
*
*/
@ApiModelProperty("提醒时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime alertTime;
/**
* 1.() 2()
*/
@ApiModelProperty("提醒分类 1.申报任务即将结束(企业) 2项目即将建设完成(政务)")
private Integer alertType;
/**
*
*/
@ApiModelProperty("提前天数提醒")
private Integer daysAdvance;
/**
*
*/
@ApiModelProperty("提醒内容")
private String alertContent;
/**
* ID
*/
@ApiModelProperty("创建ID")
@TableField(fill = FieldFill.INSERT)
private Long createId;
/**
* ID
*/
@ApiModelProperty("更新者ID")
@TableField(fill = FieldFill.UPDATE)
private Long updateId;
}

@ -0,0 +1,23 @@
package com.ruoyi.jjh.ent.entity.request;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* -
* @author du
* @since 2024/6/28 11:18
*/
@Data
public class JContactsRequest {
/**
*
*/
@NotNull
@ApiModelProperty("统一社会信用代码")
private String tyshxydm;
}

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.ent.entity.JContacts; import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact; import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -16,5 +17,5 @@ import java.util.List;
*/ */
public interface JContactsMapper extends BaseMapper<JContacts> { public interface JContactsMapper extends BaseMapper<JContacts> {
List<JContacts> page(@Param("req") JContacts jContacts); List<JContacts> page( @Param("req") JContactsRequest jContacts);
} }

@ -0,0 +1,25 @@
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.JSmartReminders;
import org.apache.ibatis.annotations.Param;
/**
* j_smart_reminders访
*
* @author makejava
* @since 2024-03-25 11:49:34
*/
public interface JSmartRemindersMapper extends BaseMapper<JSmartReminders> {
/**
*
*
* @param page
* @param jSmartReminders
* @return
*/
Page<JSmartReminders> page(Page<JSmartReminders> page, @Param("req") JSmartReminders jSmartReminders);
}

@ -3,8 +3,7 @@ package com.ruoyi.jjh.ent.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.ent.entity.JContacts; import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact; import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import java.util.List; import java.util.List;
@ -21,5 +20,5 @@ public interface JContactsService extends IService<JContacts> {
* @param jContacts * @param jContacts
* @return * @return
*/ */
List<JContacts> page( JContacts jContacts); List<JContacts> page( JContactsRequest jContacts);
} }

@ -58,5 +58,18 @@ public interface JProjectService extends IService<JProject> {
List<JProject> selectAl1l(); List<JProject> selectAl1l();
/**
*
* @return
*/
String changeTyshxydm();
/**
*
*
* @return
*/
String changeKh();
} }

@ -0,0 +1,31 @@
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.JSmartReminders;
/**
* j_smart_reminders
* @author du
* @since 2024/7/1 13:33
*/
public interface JSmartRemindersService extends IService<JSmartReminders> {
/**
*
*
* @param page
* @param jSmartReminders
* @return
*/
Page<JSmartReminders> page(Page<JSmartReminders> page, JSmartReminders jSmartReminders);
/**
*
*
* @param jSmartReminders
* @return
*/
int add(JSmartReminders jSmartReminders);
}

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.ent.entity.JContacts; import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact; import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import com.ruoyi.jjh.ent.mapper.JContactsMapper; import com.ruoyi.jjh.ent.mapper.JContactsMapper;
import com.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper; import com.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper;
@ -28,7 +29,7 @@ public class JContactsImpl extends ServiceImpl<JContactsMapper, JContacts> imple
* @return * @return
*/ */
@Override @Override
public List<JContacts> page( JContacts jContacts) { public List<JContacts> page( JContactsRequest jContacts) {
return baseMapper.page(jContacts); return baseMapper.page(jContacts);
} }
} }

@ -2,11 +2,14 @@ package com.ruoyi.jjh.ent.service.impl;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.mapper.JProjectMapper; import com.ruoyi.jjh.ent.mapper.JProjectMapper;
@ -15,6 +18,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -33,6 +37,9 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
@Resource @Resource
private IBmsTemplateInfoService iBmsTemplateInfoService; private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource
private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService;
/** /**
* *
* *
@ -127,6 +134,49 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
return lists; return lists;
} }
/**
*
* @return
*/
@Override
public String changeTyshxydm() {
List<BmsEnterpriseBasicInfo> listE = iBmsEnterpriseBasicInfoService.list();
//获取项目库信用代码为空的企业
QueryWrapper<JProject> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("credit_code");
List<JProject> listJ= this.list(queryWrapper);
listJ.forEach(x->{
listE.forEach(y->{
if (x.getDeclareUnit().equals(y.getQymc())){
JProject jp = new JProject();
jp.setId(x.getId());
jp.setCreditCode(y.getTyshxydm());
this.updateById(jp);
}
});
});
return "";
}
/**
*
*
* @return
*/
@Override
public String changeKh() {
QueryWrapper<JProject> queryWrapper = new QueryWrapper<>();
queryWrapper.like("declare_unit", "(");
List<JProject> listJ= this.list(queryWrapper);
listJ.forEach(x->{
String declareUnit = x.getDeclareUnit();
// 将英文括号替换为中文括号
String result = declareUnit.replaceAll("\\(", "")
.replaceAll("\\)", "");
x.setDeclareUnit(result);
this.updateById(x);
});
return "";
}
} }

@ -0,0 +1,59 @@
package com.ruoyi.jjh.ent.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.ent.entity.JSmartReminders;
import com.ruoyi.jjh.ent.mapper.JSmartRemindersMapper;
import com.ruoyi.jjh.ent.service.JSmartRemindersService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* j_smart_reminders
*
* @author du
* @since 2024/7/1 13:33
*/
@Service
public class JSmartRemindersServiceImpl extends ServiceImpl<JSmartRemindersMapper, JSmartReminders> implements JSmartRemindersService {
/**
*
*
* @param page
* @param jSmartReminders
* @return
*/
@Override
public Page<JSmartReminders> page(Page<JSmartReminders> page, JSmartReminders jSmartReminders) {
return baseMapper.page(page, jSmartReminders);
}
/**
*
*
* @param jSmartReminders
* @return
*/
@Override
public int add(JSmartReminders jSmartReminders) {
if (jSmartReminders.getAlertManner() == 2) {
List<JSmartReminders> list = lambdaQuery().eq(JSmartReminders::getAlertManner, 2).list();
if (list.size() >= 2) {
throw new ServiceException("已有不定期提醒,不可新增!");
}
if ((jSmartReminders.getAlertRecipients() == 1 && jSmartReminders.getAlertType() == 1)
|| (jSmartReminders.getAlertRecipients() == 2 && jSmartReminders.getAlertType() == 2)) {
save(jSmartReminders);
} else {
throw new ServiceException("参数请求错误");
}
}
return 0;
}
}

@ -63,3 +63,5 @@ spring:
multi-statement-allow: true multi-statement-allow: true
#自己客户端地址 #自己客户端地址
returnUrl: http://39.101.188.84:9999/demo/JinJiHu returnUrl: http://39.101.188.84:9999/demo/JinJiHu
#定时任务更新企业信息和联系人的开启
isTiming: false

@ -111,4 +111,5 @@ spring:
max-wait: -1ms max-wait: -1ms
#自己客户端地址 #自己客户端地址
returnUrl: https://idp.sipac.gov.cn/bms returnUrl: https://idp.sipac.gov.cn/bms
#returnUrl: http://192.168.0.105:80/ #定时任务更新企业信息和联系人的开启
isTiming: true

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口默认为8080 # 服务器的HTTP端口默认为8080
port: 9040 port: 9041
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
@ -142,6 +142,8 @@ clientSecret: Q5ym8T9XIEZAn+DSQl+aXA==
getInfoId: https://qyt.sipac.gov.cn/enterprise-gateway/sipsg-enterprise/sys/third/userInfo getInfoId: https://qyt.sipac.gov.cn/enterprise-gateway/sipsg-enterprise/sys/third/userInfo
#政务端政务通获取用户信息接口(可选) #政务端政务通获取用户信息接口(可选)
getAllInfo: http://uid.sipac.gov.cn/open/api/identity/data/FindUserById getAllInfo: http://uid.sipac.gov.cn/open/api/identity/data/FindUserById
#法人库-企业联络人员(统一社会信用代码)和法人库-法人基本信息(统一社会信用代码)生产环境
enterpriseUrl: http://172.21.10.46/api/invoke

@ -77,14 +77,14 @@
a.update_by, a.update_by,
a.update_time, a.update_time,
a.remark, a.remark,
b.enterprise_name, b.qymc as enterpriseName,
f.road, f.road,
f.enterprise_directory f.enterprise_directory
FROM FROM
bms_declaration_records AS a bms_declaration_records AS a
inner join bms_template_record f on a.template_record_id = f.id inner join bms_template_record f on a.template_record_id = f.id
LEFT JOIN bms_template_info c on a.template_id = c.id LEFT JOIN bms_template_info c on a.template_id = c.id
LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.credit_code LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.tyshxydm
left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status' left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status'
<where> <where>
<if test="enterpriseDirectory != null and enterpriseDirectory != ''">and f.enterprise_directory like <if test="enterpriseDirectory != null and enterpriseDirectory != ''">and f.enterprise_directory like
@ -126,7 +126,7 @@
SELECT SELECT
d.approval_status, d.approval_status,
a.matter, a.matter,
c.enterprise_name, c.qymc as enterpriseName,
c.id as enterpriseId, c.id as enterpriseId,
a.create_time, a.create_time,
a.`status`, a.`status`,
@ -140,7 +140,7 @@
d.approval_time d.approval_time
FROM FROM
bms_declaration_records a bms_declaration_records a
INNER JOIN bms_enterprise_basic_info c ON a.credit_code = c.credit_code INNER JOIN bms_enterprise_basic_info c ON a.credit_code = c.tyshxydm
INNER JOIN bms_template_record e on a.template_record_id = e.id INNER JOIN bms_template_record e on a.template_record_id = e.id
INNER JOIN bms_template_info i on e.template_id = i.id INNER JOIN bms_template_info i on e.template_id = i.id
INNER JOIN bms_approval_info d on a.id=d.declaration_records_id and is_before_data = 0 INNER JOIN bms_approval_info d on a.id=d.declaration_records_id and is_before_data = 0
@ -148,7 +148,7 @@
<if test="enterpriseDirectory != null and enterpriseDirectory != ''">and e.enterprise_directory like concat('%', #{enterpriseDirectory}, <if test="enterpriseDirectory != null and enterpriseDirectory != ''">and e.enterprise_directory like concat('%', #{enterpriseDirectory},
'%') '%')
</if> </if>
<if test="enterpriseName != null and enterpriseName != ''">and c.enterprise_name like concat('%', <if test="enterpriseName != null and enterpriseName != ''">and c.qymc like concat('%',
#{enterpriseName}, '%') #{enterpriseName}, '%')
</if> </if>
<if test="matter != null and matter != ''">and a.matter like concat('%', #{matter}, '%')</if> <if test="matter != null and matter != ''">and a.matter like concat('%', #{matter}, '%')</if>
@ -201,7 +201,7 @@
a.update_by, a.update_by,
a.update_time, a.update_time,
a.remark, a.remark,
b.enterprise_name, b.qymc as enterpriseName,
f.road f.road
FROM FROM
bms_declaration_records AS a bms_declaration_records AS a
@ -236,7 +236,7 @@
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo"> resultType="com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo">
SELECT a.id, SELECT a.id,
b.credit_code, b.credit_code,
b.enterprise_name, b.qymc as enterpriseName,
a.project_name, a.project_name,
a.YEAR, a.YEAR,
'' as result, '' as result,
@ -265,7 +265,7 @@
a.update_by, a.update_by,
a.update_time, a.update_time,
a.remark, a.remark,
b.enterprise_name, b.qymc as enterprise_name,
f.road f.road
FROM FROM
bms_declaration_records AS a bms_declaration_records AS a

@ -3,168 +3,31 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper"> <mapper namespace="com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper">
<resultMap type="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo" id="BmsEnterpriseBasicInfoResult">
<result property="id" column="id" />
<result property="enterpriseName" column="enterprise_name" />
<result property="creditCode" column="credit_code" />
<result property="isDeleted" column="is_deleted" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="legalEntity" column="legal_entity" />
<result property="businessStatus" column="business_status" />
<result property="establishDate" column="establish_date" />
<result property="registeredCapital" column="registered_capital" />
<result property="enterpriseType" column="enterprise_type" />
<result property="industry" column="industry" />
<result property="institutionCode" column="institution_code" />
<result property="visitorsNum" column="visitors_num" />
<result property="formerName" column="former_name" />
<result property="enrollAddress" column="enroll_address" />
<result property="enrollType" column="enroll_type" />
<result property="business" column="business" />
<result property="industryCode" column="industry_code" />
<result property="statisticalCategories" column="statistical_categories" />
</resultMap>
<sql id="selectBmsEnterpriseBasicInfoVo">
select id, enterprise_name, credit_code,
legal_entity,business_status,establish_date,registered_capital,statistical_categories,industry_code,
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
</sql>
<select id="selectBmsEnterpriseBasicInfoList" parameterType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo" resultMap="BmsEnterpriseBasicInfoResult">
<include refid="selectBmsEnterpriseBasicInfoVo"/>
<where>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="creditCode != null and creditCode != ''"> and credit_code = #{creditCode}</if>
<if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
</where>
</select>
<select id="selectBmsEnterpriseBasicInfoById" parameterType="Long" resultMap="BmsEnterpriseBasicInfoResult">
<include refid="selectBmsEnterpriseBasicInfoVo"/>
where id = #{id}
</select>
<select id="workSearch" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo"> <select id="workSearch" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
<include refid="selectBmsEnterpriseBasicInfoVo"/> select * from bms_enterprise_basic_info
<where> <where>
<if test="enterpriseInfo != null and enterpriseInfo != ''"> <if test="enterpriseInfo != null and enterpriseInfo != ''">
enterprise_name like concat('%', #{enterpriseInfo}, '%') qymc like concat('%', #{enterpriseInfo}, '%')
or credit_code like concat('%', #{enterpriseInfo}, '%') or tyshxydm like concat('%', #{enterpriseInfo}, '%')
</if> </if>
</where> </where>
</select> </select>
<select id="selectGetCreditCode" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo"> <select id="selectGetCreditCode" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
<include refid="selectBmsEnterpriseBasicInfoVo"/> select * from bms_enterprise_basic_info
<where> <where>
<if test="getCreditCode != null and getCreditCode != ''"> <if test="getCreditCode != null and getCreditCode != ''">
and credit_code = #{getCreditCode} and tyshxydm = #{getCreditCode}
</if> </if>
</where> </where>
limit 1 limit 1
</select> </select>
<select id="page" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
select * from bms_enterprise_basic_info
<where>
<if test="req.qymc != null and req.qymc != ''"> and qymc like concat('%', #{req.qymc}, '%')</if>
<if test="req.tyshxydm != null and req.tyshxydm != ''"> and tyshxydm = #{req.tyshxydm}</if>
<if test="req.isDeleted != null "> and is_deleted = #{req.isDeleted}</if>
</where>
</select>
<insert id="insertBmsEnterpriseBasicInfo" parameterType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
insert into bms_enterprise_basic_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="creditCode != null">credit_code,</if>
<if test="isDeleted != null">is_deleted,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="legalEntity != null">legal_entity,</if>
<if test="businessStatus != null">business_status,</if>
<if test="establishDate != null">establish_date,</if>
<if test="registeredCapital != null">registered_capital,</if>
<if test="enterpriseType != null">enterprise_type,</if>
<if test="industry != null">industry,</if>
<if test="institutionCode != null">institution_code,</if>
<if test="visitorsNum != null">visitors_num,</if>
<if test="formerName != null">former_name,</if>
<if test="enrollAddress != null">enroll_address,</if>
<if test="enrollType != null">enroll_type,</if>
<if test="business != null">business,</if>
<if test="industryCode != null">industry_code,</if>
<if test="statisticalCategories != null">statistical_categories,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="creditCode != null">#{creditCode},</if>
<if test="isDeleted != null">#{isDeleted},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="legalEntity != null">#{legalEntity},</if>
<if test="businessStatus != null">#{businessStatus},</if>
<if test="establishDate != null">#{establishDate},</if>
<if test="registeredCapital != null">#{registeredCapital},</if>
<if test="enterpriseType != null">#{enterpriseType},</if>
<if test="industry != null">#{industry},</if>
<if test="institutionCode != null">#{institutionCode},</if>
<if test="visitorsNum != null">#{visitorsNum},</if>
<if test="formerName != null">#{formerName},</if>
<if test="enrollAddress != null">#{enrollAddress},</if>
<if test="enrollType != null">#{enrollType},</if>
<if test="business != null">#{business},</if>
<if test="industryCode != null">#{industryCode},</if>
<if test="statisticalCategories != null">#{statisticalCategories},</if>
</trim>
</insert>
<update id="updateBmsEnterpriseBasicInfo" parameterType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
update bms_enterprise_basic_info
<trim prefix="SET" suffixOverrides=",">
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="creditCode != null">credit_code = #{creditCode},</if>
<if test="isDeleted != null">is_deleted = #{isDeleted},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="legalEntity != null">legal_entity = #{legalEntity},</if>
<if test="businessStatus != null">business_status = #{businessStatus},</if>
<if test="establishDate != null">establish_date = #{establishDate},</if>
<if test="registeredCapital != null">registered_capital = #{registeredCapital},</if>
<if test="enterpriseType != null">enterprise_type = #{enterpriseType},</if>
<if test="industry != null">industry = #{industry},</if>
<if test="institutionCode != null"> institution_code = #{institutionCode},</if>
<if test="visitorsNum != null">visitors_num = #{visitorsNum},</if>
<if test="formerName != null">former_name = #{formerName},</if>
<if test="enrollAddress != null">enroll_address = #{enrollAddress},</if>
<if test="enrollType != null">enroll_type = #{enrollType},</if>
<if test="business != null">business = #{business},</if>
<if test="industryCode != null">industry_code = #{industryCode},</if>
<if test="statisticalCategories != null">statistical_categories = #{statisticalCategories},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBmsEnterpriseBasicInfoById" parameterType="Long">
delete
from bms_enterprise_basic_info
where id = #{id}
</delete>
<delete id="deleteBmsEnterpriseBasicInfoByIds" parameterType="String">
delete from bms_enterprise_basic_info where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper> </mapper>

@ -8,9 +8,8 @@
<select id="page" resultType="com.ruoyi.jjh.ent.entity.JContacts"> <select id="page" resultType="com.ruoyi.jjh.ent.entity.JContacts">
select * from j_contacts select * from j_contacts
<where> <where>
credit_code = #{req.creditCode} <if test="req.tyshxydm != null and req.tyshxydm != '' ">
<if test="req.contactName != null and req.contactName != '' "> and tyshxydm = #{req.tyshxydm}
and contact_name like concat('%',#{req.contactName},'%')
</if> </if>
</where> </where>
order by create_time desc order by create_time desc

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.jjh.ent.mapper.JSmartRemindersMapper">
<select id="page" resultType="com.ruoyi.jjh.ent.entity.JSmartReminders">
select * from j_smart_reminders
<where>
<if test="req.rulesName != null and req.rulesName != '' ">
and rules_name = #{req.rulesName}
</if>
</where>
order by create_time desc
</select>
</mapper>

@ -118,6 +118,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
// .antMatchers("/common/**").permitAll() // .antMatchers("/common/**").permitAll()
.antMatchers("/system/chief").permitAll() .antMatchers("/system/chief").permitAll()
.antMatchers("/system/singlelogin/**").permitAll() .antMatchers("/system/singlelogin/**").permitAll()
.antMatchers("/jjh/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证 // 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated() .anyRequest().authenticated()

Loading…
Cancel
Save