suzhou-jichuang-lanhai
/
JinJiHuJava
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
wushunjie
杜函宇 7 months ago
parent a21553bcf0
commit bb3c42dc7d
6 changed files with 232 additions and 12 deletions
Show Stats Download Patch File Download Diff File

14
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java
Unescape View File

@ -5,15 +5,20 @@ import com.ruoyi.common.annotation.Log;
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.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
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.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
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.security.access.prepost.PreAuthorize;
import org.springframework.security.core.parameters.P;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
@ -32,6 +37,8 @@ public class BmsTemplateInfoController extends BaseController {
@Autowired @Autowired
private IBmsTemplateInfoService bmsTemplateInfoService; private IBmsTemplateInfoService bmsTemplateInfoService;
@Resource
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
/** /**
* 查询申报模板信息列表 * 查询申报模板信息列表
*/ */
@ -106,7 +113,12 @@ public class BmsTemplateInfoController extends BaseController {
@ApiOperation(value = "修改申报模板信息") @ApiOperation(value = "修改申报模板信息")
@PostMapping("/edit") @PostMapping("/edit")
public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) { public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) {
return toAjax(bmsTemplateInfoService.updateById(bmsTemplateInfo)); Long count = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getTemplateId,bmsTemplateInfo.getId()).count();
if(count>0){
throw new ServiceException("无法修改!");
}else {
return toAjax(bmsTemplateInfoService.updateById(bmsTemplateInfo));
}
} }
/** /**

5
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java
Unescape View File

@ -6,7 +6,10 @@ import com.ruoyi.jjh.ent.entity.response.HonorResponse;
import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse; import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse;
import com.ruoyi.jjh.ent.service.JDataScreenService; import com.ruoyi.jjh.ent.service.JDataScreenService;
import com.ruoyi.jjh.ent.service.SmsAlertsService; import com.ruoyi.jjh.ent.service.SmsAlertsService;
import io.swagger.annotations.*; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;

216
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java
Unescape View File

@ -2,18 +2,19 @@ package com.ruoyi.jjh.ent.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.response.*; import com.ruoyi.jjh.ent.entity.response.*;
import com.ruoyi.jjh.ent.mapper.JDataScreenMapper; import com.ruoyi.jjh.ent.mapper.JDataScreenMapper;
import com.ruoyi.jjh.ent.service.JContactsService;
import com.ruoyi.jjh.ent.service.JDataScreenService; import com.ruoyi.jjh.ent.service.JDataScreenService;
import com.ruoyi.jjh.ent.service.JHeadQuartersRevenueService;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.toCollection;
/** /**
* 数据大屏业务处理层 * 数据大屏业务处理层
@ -30,6 +31,14 @@ public class JDataScreenImpl implements JDataScreenService {
@Resource @Resource
private JProjectService jProjectService; private JProjectService jProjectService;
@Resource
private IBmsEnterpriseBasicInfoService enterpriseBasicInfoService;
@Resource
private JHeadQuartersRevenueService jHeadQuartersRevenueService;
@Resource
private JContactsService jc;
/** /**
* 荣誉情况 * 荣誉情况
@ -114,4 +123,203 @@ public class JDataScreenImpl implements JDataScreenService {
}); });
return all; return all;
} }
// /**
// * 数据库脱敏
// */
// @Override
// public String sqltm() {
// //修改企业库的企业名称
//规上企业营收企业加密
// List<BmsEnterpriseBasicInfo> qyList = enterpriseBasicInfoService.list();
// List<BmsEnterpriseBasicInfo> neList = new ArrayList<>();
// for (BmsEnterpriseBasicInfo items : qyList) {
// String result = items.getQymc().substring(2, items.getQymc().length()-4);
// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo();
// be.setId(items.getId());
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getQymc(), 0, 2);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4));
// be.setQymc(stringBuilder.toString());
// neList.add(be);
// }
// enterpriseBasicInfoService.updateBatchById(neList);
// //修改企业库的法人姓名
// List<BmsEnterpriseBasicInfo> qyList = enterpriseBasicInfoService.list();
// List<BmsEnterpriseBasicInfo> neList = new ArrayList<>();
// for (BmsEnterpriseBasicInfo items : qyList) {
// if(items.getFddbrxm()!=null){
// String result = items.getFddbrxm().substring(1, items.getFddbrxm().length() );
// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo();
// be.setId(items.getId());
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getFddbrxm(), 0, 1);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// be.setFddbrxm(stringBuilder.toString());
// neList.add(be);
// }
// }
// enterpriseBasicInfoService.updateBatchById(neList);
// //修改企业库的法人姓名
// List<BmsEnterpriseBasicInfo> qyList = enterpriseBasicInfoService.list();
// List<BmsEnterpriseBasicInfo> neList = new ArrayList<>();
// for (BmsEnterpriseBasicInfo items : qyList) {
// if(items.getFddbrxm()!=null){
// String result = items.getFddbrxm().substring(1, items.getFddbrxm().length() );
// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo();
// be.setId(items.getId());
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getFddbrxm(), 0, 1);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// be.setFddbrxm(stringBuilder.toString());
// neList.add(be);
// }
// }
// enterpriseBasicInfoService.updateBatchById(neList);
//修改企业库的手机号
// List<BmsEnterpriseBasicInfo> qyList = enterpriseBasicInfoService.list();
// List<BmsEnterpriseBasicInfo> neList = new ArrayList<>();
// for (BmsEnterpriseBasicInfo items : qyList) {
// if(items.getLxdh()!=null& !Objects.equals(items.getLxdh(), "")) {
// if (items.getLxdh().length() >= 10) {
// String result = items.getLxdh().substring(3, items.getLxdh().length() - 4);
// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo();
// be.setId(items.getId());
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getLxdh(), 0, 3);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// stringBuilder.append(items.getLxdh().substring(items.getLxdh().length() - 4));
// be.setLxdh(stringBuilder.toString());
// neList.add(be);
// } else if(items.getLxdh().length() >= 4){
// String result = items.getLxdh().substring(2, items.getLxdh().length() - 2);
// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo();
// be.setId(items.getId());
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getLxdh(), 0, 2);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// stringBuilder.append(items.getLxdh().substring(items.getLxdh().length() - 2));
// be.setLxdh(stringBuilder.toString());
// neList.add(be);
// }
// }
// }
// enterpriseBasicInfoService.updateBatchById(neList);
//规上企业营收企业加密
// List<BmsEnterpriseBasicInfo> jDataScreenMapper1 = jDataScreenMapper.get1();
// System.out.println(jDataScreenMapper1.size());
// List<BmsEnterpriseBasicInfo> neList = new ArrayList<>();
// for (BmsEnterpriseBasicInfo items : jDataScreenMapper1) {
// String result = items.getQymc().substring(2, items.getQymc().length()-4);
// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo();
// be.setId(items.getId());
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getQymc(), 0, 2);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4));
// be.setQymc(stringBuilder.toString());
// neList.add(be);
// }
// for (BmsEnterpriseBasicInfo i : neList) {
// jDataScreenMapper.up(i);
// }
//联系人修改
// List<JContacts> list = jc.list();
// List<JContacts> newList = new ArrayList<>();
// for (JContacts items : list) {
// JContacts be = new JContacts();
// System.out.println(items.getDwAgencykey());
// be.setDwAgencykey(items.getDwAgencykey());
// if (items.getQymc() != null) {
// String result = items.getQymc().substring(2, items.getQymc().length() - 4);
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getQymc(), 0, 2);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// stringBuilder.append(items.getQymc().substring(items.getQymc().length() - 4));
// be.setQymc(stringBuilder.toString());
// }
// if (items.getLlrxm() != null & !Objects.equals(items.getLlrxm(), "")) {
// String result = items.getLlrxm().substring(1, items.getLlrxm().length());
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getLlrxm(), 0, 1);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// be.setLlrxm(stringBuilder.toString());
// }
// if (items.getDzyx() != null & !Objects.equals(items.getDzyx(), "")) {
// StringBuilder stringBuilder = new StringBuilder();
// for (int i = 0; i < 4; i++) {
// stringBuilder.append("*");
// }
// String result = items.getDzyx().substring(4, items.getDzyx().length());
// stringBuilder.append(result);
// be.setDzyx(stringBuilder.toString());
// }
// if (items.getYddh() != null &!Objects.equals(items.getYddh(), "")) {
// if (items.getYddh().length() >= 10) {
// String result = items.getYddh().substring(3, items.getYddh().length() - 4);
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getYddh(), 0, 3);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// stringBuilder.append(items.getYddh().substring(items.getYddh().length() - 4));
// be.setYddh(stringBuilder.toString());
// } else if (items.getYddh().length() >= 4) {
// String result = items.getYddh().substring(2, items.getYddh().length() - 2);
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getYddh(), 0, 2);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// stringBuilder.append(items.getYddh().substring(items.getYddh().length() - 2));
// be.setYddh(stringBuilder.toString());
// }
// }
// newList.add(be);
// }
// jc.updateBatchById(newList);
//
// //修改总部企业
// List<BmsEnterpriseBasicInfo> qyList = jDataScreenMapper.getjh();
// List<BmsEnterpriseBasicInfo> neList = new ArrayList<>();
// for (BmsEnterpriseBasicInfo items : qyList) {
// String result = items.getQymc().substring(2, items.getQymc().length()-4);
// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo();
// be.setId(items.getId());
// StringBuilder stringBuilder = new StringBuilder();
// stringBuilder.append(items.getQymc(), 0, 2);
// for (int i = 0; i < result.length(); i++) {
// stringBuilder.append("*");
// }
// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4));
// be.setQymc(stringBuilder.toString());
// neList.add(be);
// }
// for (BmsEnterpriseBasicInfo i : neList) {
// jDataScreenMapper.upjh(i);
// }
// return null;
// }
} }

4
ruoyi-admin/src/main/resources/application-druid.yml
Unescape View File

@ -62,8 +62,8 @@ spring:
config: config:
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
returnUrl: http://192.168.0.111:80 #returnUrl: http://192.168.0.110:80
#定时任务更新企业信息和联系人的开启 #定时任务更新企业信息和联系人的开启
isTiming: false isTiming: false

4
ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml
Unescape View File

@ -33,12 +33,10 @@
a.start_time, a.start_time,
a.end_time, a.end_time,
b.responsibility_unit, b.responsibility_unit,
a.create_time, a.create_time
c.nick_name as createByName
FROM FROM
bms_template_record a bms_template_record a
INNER JOIN bms_template_info b ON a.template_id = b.id INNER JOIN bms_template_info b ON a.template_id = b.id
INNER JOIN sys_user c ON b.create_by = c.user_id
<where> <where>
<if test="req.enterpriseDirectory != null and req.enterpriseDirectory != ''">and a.enterprise_directory like <if test="req.enterpriseDirectory != null and req.enterpriseDirectory != ''">and a.enterprise_directory like
concat('%', #{req.enterpriseDirectory}, '%') concat('%', #{req.enterpriseDirectory}, '%')

1
ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
Unescape View File

@ -3,7 +3,6 @@
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.ent.mapper.JDataScreenMapper"> <mapper namespace="com.ruoyi.jjh.ent.mapper.JDataScreenMapper">
<select id="getHonor" resultType="com.ruoyi.jjh.ent.entity.response.HonorResponse"> <select id="getHonor" resultType="com.ruoyi.jjh.ent.entity.response.HonorResponse">
SELECT a.dict_label AS projectBigName, SELECT a.dict_label AS projectBigName,
a.dict_value AS projectBigType, a.dict_value AS projectBigType,

Write Preview
Loading…
Cancel
Save