dongdingding
杜函宇 11 months ago
parent 111305426d
commit ff52bb437e

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.controller;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@ -7,7 +8,12 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.ent.entity.JMemorandum;
import com.ruoyi.jjh.ent.entity.JProject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@ -17,6 +23,7 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -27,6 +34,7 @@ import java.util.List;
* @author farben
* @date 2023-08-25
*/
@Api(tags = "企业基础信息")
@RestController
@RequestMapping("/system/enterpriseBasicInfo")
public class BmsEnterpriseBasicInfoController extends BaseController {
@ -37,6 +45,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/**
*
*/
@ApiOperation(value = "查询企业基础信息列表", response = BmsEnterpriseBasicInfo.class)
// @RequiresPermissions("system:enterpriseBasicInfo:list")
@GetMapping("/list")
public TableDataInfo list(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
@ -45,10 +54,19 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
return getDataTable(list);
}
/**
*
*/
@ApiOperation(value = "作业台查询企业信息" ,response = BmsEnterpriseBasicInfo.class)
@GetMapping("/workSearch")
public AjaxResult workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) {
return AjaxResult.success(bmsEnterpriseBasicInfoService.workSearch(enterpriseInfoWorkRequest));
}
/**
*
*/
// @RequiresPermissions("system:enterpriseBasicInfo:export")
@ApiOperation(value = "导出企业基础信息列表")
@Log(title = "企业基础信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
@ -57,9 +75,31 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
util.exportExcel(response, list, "企业基础信息数据");
}
/**
*
*/
@ApiOperation(value = "导入企业基础信息列表")
@Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT)
@PostMapping("/importEnterprise")
public AjaxResult importEnterprise(MultipartFile file) throws Exception{
List<BmsEnterpriseBasicInfo> allList = bmsEnterpriseBasicInfoService.list();
ExcelUtil<BmsEnterpriseBasicInfo> util = new ExcelUtil<>(BmsEnterpriseBasicInfo.class);
List<BmsEnterpriseBasicInfo> proList = util.importExcel(file.getInputStream());
StringBuilder successMsg = new StringBuilder();
if (proList == null || proList.isEmpty()) {
throw new ServiceException("企业导入数据不能为空");
} else {
proList.removeIf(entityA -> allList.stream().anyMatch(entityB -> entityB.getCreditCode().equals(entityA.getCreditCode())));
bmsEnterpriseBasicInfoService.saveBatch(proList);
successMsg.append("导入成功");
}
return AjaxResult.success(successMsg);
}
/**
*
*/
@ApiOperation(value = "获取企业基础信息详细信息" ,response = BmsEnterpriseBasicInfo.class)
// @RequiresPermissions("system:enterpriseBasicInfo:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
@ -69,7 +109,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/**
*
*/
// @RequiresPermissions("system:enterpriseBasicInfo:add")
@ApiOperation(value = "新增企业基础信息")
@Log(title = "企业基础信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
@ -79,6 +119,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/**
*
*/
@ApiOperation(value = "修改企业基础信息")
// @RequiresPermissions("system:enterpriseBasicInfo:edit")
@Log(title = "企业基础信息", businessType = BusinessType.UPDATE)
@PutMapping
@ -89,6 +130,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/**
*
*/
@ApiOperation(value = "删除企业基础信息")
// @RequiresPermissions("system:enterpriseBasicInfo:remove")
@Log(title = "企业基础信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")

@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -16,6 +19,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author farben
* @date 2023-08-25
*/
@ApiModel("企业基础信息对象")
@Data
@EqualsAndHashCode(callSuper = true)
public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
@ -31,6 +35,7 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
/**
*
*/
@ApiModelProperty("企业名称")
@JSONField(name = "企业名称")
@Excel(name = "企业名称")
private String enterpriseName;
@ -38,49 +43,137 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
/**
*
*/
@ApiModelProperty("企业统一信用代码")
@JSONField(name = "企业统一信用代码")
@Excel(name = "企业统一信用代码")
private String creditCode;
/**
*
*/
@ApiModelProperty("法定代表人")
@JSONField(name = "法定代表人")
@Excel(name = "法定代表人")
private String legalEntity;
/**
*
*/
@ApiModelProperty("经营状态")
@JSONField(name = "经营状态")
@Excel(name = "经营状态")
private String businessStatus;
/**
*
*/
@ApiModelProperty("成立日期")
@JSONField(name = "成立日期")
@Excel(name = "成立日期")
private String establishDate;
/**
*
*/
@ApiModelProperty("注册资本")
@JSONField(name = "注册资本")
@Excel(name = "注册资本")
private String registeredCapital;
/**
*
*/
@ApiModelProperty("企业类型")
@JSONField(name = "企业类型")
@Excel(name = "企业类型")
private String enterpriseType;
/**
*
*/
@ApiModelProperty("所属行业")
@JSONField(name = "所属行业")
@Excel(name = "所属行业")
private String industry;
/**
*
*
*/
@JSONField(name = "联系人")
@Excel(name = "联系人")
private String contacts;
@ApiModelProperty("组织机构代码")
@JSONField(name = "组织机构代码")
@Excel(name = "组织机构代码")
private String institutionCode;
/**
*
*
*/
@JSONField(name = "联系人电话")
@Excel(name = "联系人电话")
private String contactsNumber;
@ApiModelProperty("参保人数")
@JSONField(name = "参保人数")
@Excel(name = "参保人数")
private String visitorsNum;
/**
*
*
*/
@JSONField(name = "企业地址")
@Excel(name = "企业地址")
private String address;
@ApiModelProperty("曾用名")
@JSONField(name = "曾用名")
@Excel(name = "曾用名")
private String formerName;
/**
*
*/
@ApiModelProperty("注册地址")
@JSONField(name = "注册地址")
@Excel(name = "注册地址")
private String enrollAddress;
/**
*
*/
@ApiModelProperty("注册类型")
@JSONField(name = "注册类型")
@Excel(name = "注册类型")
private String enrollType;
/**
*
*/
@ApiModelProperty("经营范围")
@JSONField(name = "经营范围")
@Excel(name = "经营范围")
private String business;
// /**
// * 联系人
// */
// @JSONField(name = "联系人")
// @Excel(name = "联系人")
// private String contacts;
//
// /**
// * 联系人电话
// */
// @JSONField(name = "联系人电话")
// @Excel(name = "联系人电话")
// private String contactsNumber;
//
// /**
// * 企业地址
// */
// @JSONField(name = "企业地址")
// @Excel(name = "企业地址")
// private String address;
/**
* 01
*/
@ApiModelProperty("是否删除0未删除1已删除")
@JSONField(serialize=false)
@Excel(name = "是否删除",readConverterExp = "0=未删除,1=已删除")
private Long isDeleted;
@Override
public String toString() {
return "BmsEnterpriseBasicInfo{" +
"id=" + id +
", enterpriseName='" + enterpriseName + '\'' +
", creditCode='" + creditCode + '\'' +
", contacts='" + contacts + '\'' +
", contactsNumber='" + contactsNumber + '\'' +
", address='" + address + '\'' +
", isDeleted=" + isDeleted +
'}';
}
}

@ -0,0 +1,19 @@
package com.ruoyi.jjh.declaration.entity.request;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
* @author du
* @since 2024/5/28 8:55
*/
@Data
@ApiModel("作业台企业请求体")
public class EnterpriseInfoWorkRequest {
@ApiModelProperty("企业法人,高管姓名,企业关键字")
private String enterpriseInfo;
}

@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import java.util.List;
@ -59,4 +60,9 @@ public interface BmsEnterpriseBasicInfoMapper extends BaseMapper<BmsEnterpriseBa
* @return
*/
public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids);
/**
*
*/
List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest);
}

@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import java.util.List;
@ -59,4 +60,6 @@ public interface IBmsEnterpriseBasicInfoService extends IService<BmsEnterpriseBa
* @return
*/
public int deleteBmsEnterpriseBasicInfoById(Long id);
List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest);
}

@ -138,6 +138,7 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
BmsBigStrongAwardQueryVo p1 = declarationRecordsVo.getBmsBigStrongAwardQueryVo();
//做大做强对象JSON
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -118,6 +118,7 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
BmsBrandingAward p1 = declarationRecordsVo.getBmsBrandingAward();
//品牌打造奖补JSON
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -117,6 +117,7 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
BmsCarrierConstructionAward p1 = declarationRecordsVo.getBmsCarrierConstructionAward();
//载体建设奖补JSON
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -118,6 +118,7 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
BmsCreditManagement p1 = declarationRecordsVo.getBmsCreditManagement();
//信用管理奖补JSON
// String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -3,6 +3,7 @@ package com.ruoyi.jjh.declaration.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import org.springframework.stereotype.Service;
@ -85,4 +86,9 @@ public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterprise
public int deleteBmsEnterpriseBasicInfoById(Long id) {
return baseMapper.deleteBmsEnterpriseBasicInfoById(id);
}
@Override
public List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) {
return baseMapper.workSearch(enterpriseInfoWorkRequest);
}
}

@ -116,6 +116,7 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
BmsIndustrialInternetAward p1 = declarationRecordsVo.getBmsIndustrialInternetAward();
//5G+工业互联网奖补JSON
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -117,6 +117,7 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
BmsIntegrationIndustries p1 = declarationRecordsVo.getBmsIntegrationIndustries();
//两业融合奖补申请JSON
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -119,6 +119,7 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
BmsLogisticsDevelopmentAward p1 = declarationRecordsVo.getBmsLogisticsDevelopmentAward();
//物流发展奖补JSON
// String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -116,6 +116,7 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
BmsManufacturingServicesAward p1 = declarationRecordsVo.getBmsManufacturingServicesAward();
//制造服务业有效投入奖补JSON
// String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -120,6 +120,7 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
BmsPlatformConstructionAward p1 = declarationRecordsVo.getBmsPlatformConstructionAward();
//平台建设奖补json
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -142,6 +142,7 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
BmsProjectSettlementAwardQueryVo p1 = declarationRecordsVo.getBmsProjectSettlementAwardQueryVo();
//落户奖补对象JSON
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -117,6 +117,7 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
BmsSceneOpeningAward p1 = declarationRecordsVo.getBmsSceneOpeningAward();
//场景开放奖补JSON
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));

@ -113,6 +113,12 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
@Transactional(rollbackFor = Exception.class)
public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto) {
int num = 0;
QueryWrapper<BmsTemplateRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enterprise_directory", bmsTemplateRecordAddDto.getEnterpriseDirectory());
List<BmsTemplateRecord> isFlag = baseMapper.selectList(queryWrapper);
if(isFlag.isEmpty()){
throw new ServiceException("该申报任务标题已经存在");
}
//新增的时候根据当前时间判断状态是否有效
tiTimeChange.getTime(bmsTemplateRecordAddDto);
//添加在线模板
@ -124,61 +130,23 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
List<BmsDeclarationRecords> drlist = new ArrayList<>();
//如果前端部分企业名录集合为空
if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) {
// //保存所有的信用代码
// List<String> codeList = new ArrayList<>();
// for (BmsEnterpriseDirectory x : enterpriseDirectoryList) {
// codeList.add(x.getCreditCode());
// }
// //根据信用代码去企业信息表里查找该企业,如果能找到并且该企业未填报过该模板 就添加企业id
// LambdaQueryWrapper<BmsEnterpriseBasicInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getCreditCode, codeList);
// List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper);
//如果能找到该企业就是集合不为空的话,并且长度和excel企业名录长度一致的话
// if (!list.isEmpty() & list.size() == enterpriseDirectoryList.size()) {
//保存所有能在企业基础信息里面找的企业id
// List<Long> idList = new ArrayList<>();
// list.forEach(a1 -> {
// idList.add(a1.getId());
//保存在在线申报模板集合里面
// });
List<String> codeList = new ArrayList<>();
enterpriseDirectoryList.forEach(x -> {
codeList.add(x.getCreditCode());
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId());
x.setTemplateRecordId(bmsTemplateRecordAddDto.getId());
});
//在在线申报记录里面找到对于该模板和该企业的在线申报记录
List<BmsDeclarationRecords> bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordAddDto.getTemplateId(), codeList);
//如果一条也没有找到就添加到企业名录表里呢
if (bm.isEmpty()) {
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
} else {
//如果有的企业已经对该模板分配过申请任务的话就报错
throw new ServiceException("某企业已经分配该模板任务");
}
// }else {
// throw new ServiceException("某企业不在企业信息库");
// }
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
} else {
List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list();
List<BmsEnterpriseDirectory> copyList = new ArrayList<>();
//保存所有的企业信用代码
List<String> idList = new ArrayList<>();
for (BmsEnterpriseBasicInfo items : list) {
BmsEnterpriseDirectory bms = new BmsEnterpriseDirectory();
bms.setTemplateRecordId(bmsTemplateRecordAddDto.getId());
bms.setEnterpriseName(items.getEnterpriseName());
bms.setCreditCode(items.getCreditCode());
idList.add(items.getCreditCode());
copyList.add(bms);
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId());
}
List<BmsDeclarationRecords> bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordAddDto.getTemplateId(), idList);
if (bm.isEmpty()) {
enterpriseDirectoryService.saveBatch(copyList);
} else {
throw new ServiceException("某企业已经分配该模板任务");
}
enterpriseDirectoryService.saveBatch(copyList);
}
iBmsDeclarationRecordsService.saveBatch(drlist);
return num;

@ -150,13 +150,13 @@ public class CommonServiceImpl implements ICommonService {
throw new ServiceException("该申请已经错过时间");
}
//查看该企业是否已经填报过
BmsTemplateRecord templateRecordOne = iBmsTemplateRecordService.getById(templateRecordId);
List<BmsDeclarationRecords> list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateId, templateRecordOne.getTemplateId()).list();
list.forEach(x->{
if(x.getDetailId() != null){
throw new ServiceException("该企业已经申请,请勿重复申请!");
}
});
// BmsTemplateRecord templateRecordOne = iBmsTemplateRecordService.getById(templateRecordId);
// List<BmsDeclarationRecords> list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateId, templateRecordOne.getTemplateId()).list();
// list.forEach(x->{
// if(x.getDetailId() != null){
// throw new ServiceException("该企业已经申请,请勿重复申请!");
// }
// });
}
/**

@ -0,0 +1,96 @@
package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import com.ruoyi.jjh.ent.service.JContactsService;
import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.Arrays;
/**
* ()j_contacts
* @author du
* @since 2024/5/13 9:56
*/
@RestController
@RequestMapping("/jjh/jContacts")
@Api(tags = "企业联系人信息(存在多个)")
public class JContactsController extends BaseController {
@Resource
private JContactsService jContactsService;
/**
*
*
* @param jContacts
* @return
*/
@ApiOperation(value = "分页查询所有数据", response = JContacts.class)
@GetMapping
public AjaxResult selectAll( JContacts jContacts) {
if(jContacts.getCreditCode()==null || jContacts.getCreditCode().isEmpty()){
throw new ServiceException("该企业的信用代码不可为空");
}
return success(jContactsService.page(jContacts));
}
/**
*
*
* @param id
* @return
*/
@ApiOperation(value = "通过主键查询单条数据", response = JContacts.class)
@GetMapping("{id}")
public AjaxResult selectOne(@PathVariable Serializable id) {
return success(jContactsService.getById(id));
}
/**
*
*
* @param jContacts
* @return
*/
@ApiOperation(value = "新增数据")
@PostMapping
public AjaxResult insert(@RequestBody JContacts jContacts) {
return success(jContactsService.save(jContacts));
}
/**
*
*
* @param jContacts
* @return
*/
@ApiOperation(value = "修改数据")
@PutMapping
public AjaxResult update(@RequestBody JContacts jContacts) {
return success(jContactsService.updateById(jContacts));
}
/**
*
*
* @param id
* @return
*/
@ApiOperation(value = "删除数据")
@DeleteMapping
public AjaxResult delete(@RequestParam("id") Long[] id) {
return success(jContactsService.removeByIds(Arrays.asList(id)));
}
}

@ -15,13 +15,13 @@ import java.io.Serializable;
import java.util.Arrays;
/**
* j_enterprise_contact
* j_enterprise_contact
* @author du
* @since 2024/5/13 9:56
*/
@RestController
@RequestMapping("/jjh/jEnterpriseContact")
@Api(tags = "企业联系人")
@Api(tags = "企业端信息维护")
public class JEnterpriseContactController extends BaseController {
@Resource

@ -2,9 +2,13 @@ package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.ent.entity.JMemorandum;
import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest;
import com.ruoyi.jjh.ent.service.JMemorandumService;
@ -21,8 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* (JMemorandum)
@ -54,7 +60,7 @@ public class JMemorandumController extends BaseController {
}
/**
* IDID
* IDIDID
*
* @param jMemorandumRequest
* @return
@ -62,8 +68,11 @@ public class JMemorandumController extends BaseController {
@ApiOperation(value = "根据关联项目库ID查询该ID下的备忘录", response = JMemorandum.class)
@GetMapping("/getIdToList")
public AjaxResult selectIdToAll(JMemorandumRequest jMemorandumRequest) {
if (jMemorandumRequest.getType() == null) {
throw new ServiceException("分类不可为空");
}
if (jMemorandumRequest.getProjectId() == null) {
throw new ServiceException("项目库ID不能为空");
throw new ServiceException("ID不可为空");
}
return success(jMemorandumService.selectIdToAll(jMemorandumRequest));
}
@ -77,7 +86,7 @@ public class JMemorandumController extends BaseController {
@ApiOperation(value = "通过主键查询单条数据", response = JMemorandum.class)
@GetMapping("{id}")
public AjaxResult selectOne(@PathVariable Serializable id) {
return success(this.jMemorandumService.getById(id));
return success(jMemorandumService.getById(id));
}
/**
@ -92,6 +101,18 @@ public class JMemorandumController extends BaseController {
return success(jMemorandumService.save(jMemorandum));
}
/**
*
*/
@ApiOperation(value = "导出备忘录表")
@Log(title = "导出备忘录表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, JMemorandumRequest jemorandum) {
List<JMemorandum> list = jMemorandumService.selectIdToAll(jemorandum);
ExcelUtil<JMemorandum> util = new ExcelUtil<>(JMemorandum.class);
util.exportExcel(response, list, "备忘录");
}
/**
*
*

@ -49,10 +49,22 @@ public class JProjectController extends BaseController {
*/
@ApiOperation(value = "分页查询项目", response = JProject.class)
@GetMapping
public AjaxResult selectAll(Page<JProject> page, JProject jProject) {
public AjaxResult selectPage(Page<JProject> page, JProject jProject) {
return success(jProjectService.page(page, jProject));
}
/**
* ()
*
* @param name
* @return
*/
@ApiOperation(value = "作业台查询所有项目(政务端)", response = JProject.class)
@GetMapping("/selectAll")
public AjaxResult selectAll(@RequestParam String name) {
return success(jProjectService.selectAll(name));
}
/**
*
*
@ -124,7 +136,7 @@ public class JProjectController extends BaseController {
ProjectExcelUtil<JProject> util = new ProjectExcelUtil<>(JProject.class);
List<JProject> proList = util.importExcel(file.getInputStream());
StringBuilder successMsg = new StringBuilder();
if (proList == null && proList.isEmpty()) {
if (proList == null || proList.isEmpty()) {
throw new ServiceException("项目导入数据不能为空");
} else {
jProjectService.saveBatch(proList);
@ -148,7 +160,7 @@ public class JProjectController extends BaseController {
ProjectValueUtil<JProject> util = new ProjectValueUtil<>(JProject.class);
List<JProject> proList = util.importExcel(file.getInputStream(), projectClassify);
StringBuilder successMsg = new StringBuilder();
if (proList == null && proList.isEmpty()) {
if (proList == null || proList.isEmpty()) {
throw new ServiceException("项目导入数据不能为空");
} else {
jProjectService.saveBatch(proList);

@ -0,0 +1,77 @@
package com.ruoyi.jjh.ent.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* ()j_contacts
* @author du
* @since 2024/5/13 9:49
*/
@Data
@ApiModel("企业联系人信息(存在多个)")
@TableName(value = "j_contacts")
public class JContacts extends BaseInfoEntity {
/**
* Id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty("Id")
private Long id;
/**
*
*/
@Excel(name = "联系人姓名")
@ApiModelProperty("联系人姓名")
private String contactName;
/**
*
*/
@Excel(name = "公司职务")
@ApiModelProperty("公司职务")
private String firmOffice;
/**
*
*/
@Excel(name = "企业统一社会信用代码")
@ApiModelProperty("企业统一社会信用代码")
private String creditCode;
/**
*
*/
@Excel(name = "手机号")
@ApiModelProperty("手机号")
private String phone;
/**
*
*/
@Excel(name = "邮箱")
@ApiModelProperty("邮箱")
private String email;
/**
* id
*/
@JSONField(serialize=false)
@TableField(fill = FieldFill.INSERT)
private Long createId;
/**
* id
*/
@JSONField(serialize=false)
@TableField(fill = FieldFill.UPDATE)
private Long updateId;
}

@ -2,6 +2,7 @@ package com.ruoyi.jjh.ent.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -26,28 +27,38 @@ public class JMemorandum {
@ApiModelProperty("Id")
private Long id;
/**
* id
* idid
*/
@ApiModelProperty("项目表关联id")
@ApiModelProperty("项目表关联id或者企业信息表关联id")
private Long projectId;
/**
*
*/
@Excel(name = "分类",readConverterExp = "1=企业信息,2=项目")
@ApiModelProperty("名字,1=企业信息库的id,2=项目库对应的id")
private String type;
/**
*
*/
@ApiModelProperty("名字")
@Excel(name = "名字")
private String name;
/**
* /
*/
@Excel(name = "主题/关键字")
@ApiModelProperty("主题/关键字")
private String keywords;
/**
*
*/
@Excel(name = "备忘内容")
@ApiModelProperty("备忘内容")
private String content;
/**
* ID
*/
@ -59,12 +70,14 @@ public class JMemorandum {
*
*/
@ApiModelProperty("创建者")
@Excel(name = "创建者")
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
*
*/
@Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

@ -58,6 +58,13 @@ public class JProject{
@ApiModelProperty("申报单位")
private String declareUnit;
/**
*
*/
@Excel(name = "企业信用代码")
@ApiModelProperty("企业信用代码")
private String creditCode;
/**
*
*/

@ -22,6 +22,12 @@ public class JMemorandumRequest {
@ApiModelProperty("项目库关联ID")
private Long projectId;
/**
*
*/
@ApiModelProperty("名字,1=企业信息库的id,2=项目库对应的id")
private String type;
/**
*
*/

@ -0,0 +1,20 @@
package com.ruoyi.jjh.ent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* ()j_contacts
* @author du
* @since 2024/5/6 13:57
*/
public interface JContactsMapper extends BaseMapper<JContacts> {
List<JContacts> page(@Param("req") JContacts jContacts);
}

@ -25,6 +25,7 @@ public interface JMemorandumMapper extends BaseMapper<JMemorandum> {
*/
Page<JMemorandum> page(Page<JMemorandum> page, @Param("req") JMemorandumRequest jMemorandumRequest);
List<JMemorandum> page(@Param("req") JMemorandumRequest jMemorandumRequest);
/**
* IDID
*

@ -26,6 +26,8 @@ public interface JProjectMapper extends BaseMapper<JProject> {
*/
Page<JProject> page(Page<JProject> page,@Param("req") JProject jProject);
List<JProject> page(@Param("req") JProject jProject);
/**
* 线
*
@ -33,5 +35,9 @@ public interface JProjectMapper extends BaseMapper<JProject> {
* @return
*/
List<BmsApprovalInfoQueryVo> getApprovalInfoList(@Param("id") Serializable id);
List<JProject> selectAll(@Param("name") String name);
}

@ -0,0 +1,25 @@
package com.ruoyi.jjh.ent.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import java.util.List;
/**
* ()j_contacts
* @author du
* @since 2024/5/13 9:58
*/
public interface JContactsService extends IService<JContacts> {
/**
*
*
* @param jContacts
* @return
*/
List<JContacts> page( JContacts jContacts);
}

@ -24,7 +24,7 @@ public interface JMemorandumService extends IService<JMemorandum> {
*/
Page<JMemorandum> page(Page<JMemorandum> page, JMemorandumRequest jMemorandumRequest);
List<JMemorandum> page( JMemorandumRequest jMemorandumRequest);
/**
* IDID
*

@ -47,5 +47,15 @@ public interface JProjectService extends IService<JProject> {
Long saveProject(Map<String, String> allJson);
void updateTheJson( Map<String, String> allJson);
/**
*
*
* @param jProject
* @return
*/
List<JProject> selectAll(String jProject);
}

@ -0,0 +1,34 @@
package com.ruoyi.jjh.ent.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import com.ruoyi.jjh.ent.mapper.JContactsMapper;
import com.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper;
import com.ruoyi.jjh.ent.service.JContactsService;
import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* ()j_contacts
* @author du
* @since 2024/5/13 9:58
*/
@Service
public class JContactsImpl extends ServiceImpl<JContactsMapper, JContacts> implements JContactsService {
/**
*
*
* @param jContacts
* @return
*/
@Override
public List<JContacts> page( JContacts jContacts) {
return baseMapper.page(jContacts);
}
}

@ -31,6 +31,11 @@ public class JMemorandumServiceImpl extends ServiceImpl<JMemorandumMapper, JMemo
return baseMapper.page(page,jMemorandumRequest);
}
@Override
public List<JMemorandum> page(JMemorandumRequest jMemorandumRequest) {
return baseMapper.page(jMemorandumRequest);
}
/**
* IDID
*

@ -3,7 +3,6 @@ package com.ruoyi.jjh.ent.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
@ -86,6 +85,7 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
@Override
public Long saveProject(Map<String, String> allJson) {
JProject jP = new JProject();
jP.setCreditCode(allJson.get("credit_code"));
jP.setProjectYear(allJson.get("year"));
jP.setProjectName(allJson.get("projectName"));
jP.setDeclareUnit(allJson.get("declareUnit"));
@ -108,5 +108,12 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
jP.setFileJson(allJson.get("fileJson"));
baseMapper.updateById(jP);
}
@Override
public List<JProject> selectAll(String jProject) {
return baseMapper.selectAll(jProject);
}
}

@ -107,10 +107,10 @@
</foreach>
</if>
<if test="statusChange == 0">
and a.status = 0
and a.status in (0,10)
</if>
<if test="statusChange == 1">
and a.status != 0
and a.status is not in (0,10)
</if>
<if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
</where>

@ -8,19 +8,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="enterpriseName" column="enterprise_name" />
<result property="creditCode" column="credit_code" />
<result property="contacts" column="contacts" />
<result property="contactsNumber" column="contacts_number" />
<result property="address" column="address" />
<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" />
</resultMap>
<sql id="selectBmsEnterpriseBasicInfoVo">
select id, enterprise_name, credit_code, contacts, contacts_number, address, is_deleted, create_by, create_time, update_by, update_time, remark from bms_enterprise_basic_info
select id, enterprise_name, credit_code,
legal_entity,business_status,establish_date,registered_capital,
enterprise_type,industry,institution_code,visitors_num,former_name,enroll_address,
enroll_type,business,
is_deleted, create_by, create_time, update_by, update_time, remark from bms_enterprise_basic_info
</sql>
<select id="selectBmsEnterpriseBasicInfoList" parameterType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo" resultMap="BmsEnterpriseBasicInfoResult">
@ -28,9 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="contacts != null and contacts != ''"> and contacts = #{contacts}</if>
<if test="contactsNumber != null and contactsNumber != ''"> and contacts_number = #{contactsNumber}</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
</where>
</select>
@ -39,6 +50,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBmsEnterpriseBasicInfoVo"/>
where id = #{id}
</select>
<select id="workSearch" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
<include refid="selectBmsEnterpriseBasicInfoVo"/>
<where>
<if test="enterpriseInfo != null and enterpriseInfo != ''">
enterprise_name like concat('%', #{enterpriseInfo}, '%')
or credit_code like concat('%', #{enterpriseInfo}, '%')
</if>
</where>
</select>
<insert id="insertBmsEnterpriseBasicInfo" parameterType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
insert into bms_enterprise_basic_info
@ -46,29 +66,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="creditCode != null">credit_code,</if>
<if test="contacts != null">contacts,</if>
<if test="contactsNumber != null">contacts_number,</if>
<if test="address != null">address,</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>
</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="contacts != null">#{contacts},</if>
<if test="contactsNumber != null">#{contactsNumber},</if>
<if test="address != null">#{address},</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>
</trim>
</insert>
@ -77,15 +116,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="creditCode != null">credit_code = #{creditCode},</if>
<if test="contacts != null">contacts = #{contacts},</if>
<if test="contactsNumber != null">contacts_number = #{contactsNumber},</if>
<if test="address != null">address = #{address},</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>
</trim>
where id = #{id}
</update>

@ -0,0 +1,18 @@
<?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.JContactsMapper">
<select id="page" resultType="com.ruoyi.jjh.ent.entity.JContacts">
select * from j_contacts
<where>
credit_code = #{req.creditCode}
<if test="req.contactName != null and req.contactName != '' ">
and contact_name like concat('%',#{req.contactName},'%')
</if>
</where>
order by create_time desc
</select>
</mapper>

@ -21,6 +21,7 @@
<select id="selectIdToAll" resultType="com.ruoyi.jjh.ent.entity.JMemorandum">
select * from j_memorandum
<where>
type = #{req.type} and project_id = #{req.projectId}
<if test="req.name != null and req.name != '' ">
and name like concat('%',#{req.name},'%') or keywords like concat('%',#{req.name},'%')
</if>
@ -30,7 +31,6 @@
<if test="req.endTime != null">
and create_time &lt;= #{req.endTime}
</if>
and project_id = #{req.projectId}
</where>
</select>
</mapper>

@ -7,6 +7,9 @@
<select id="page" resultType="com.ruoyi.jjh.ent.entity.JProject">
select * from j_project
<where>
<if test="req.creditCode != null and req.creditCode != '' ">
and credit_code = #{req.creditCode}
</if>
<if test="req.projectName != null and req.projectName != '' ">
and project_name like concat('%',#{req.projectName},'%')
</if>
@ -43,4 +46,15 @@
where a.id=#{id}
order by c.sort asc
</select>
<select id="selectAll" resultType="com.ruoyi.jjh.ent.entity.JProject">
select * from j_project
<where>
<if test="name != null and name != '' ">
and credit_code like concat('%',#{name},'%')
or project_name like concat('%',#{name},'%')
or declare_unit like concat('%',#{name},'%')
</if>
</where>
order by create_time desc ,project_year desc
</select>
</mapper>

Loading…
Cancel
Save