Skip to content

J
jilinzhongdianrenqun
Commit 801ef378 by wangchunyang
Options

1 超期没评分的，可以提交评分，记录实际评分时间。 

2 评分的时候，如果状态是有的需要显示多加一行备注，必填。下面也需要多一个参会人员，和评分时间，手动维护。
3 重点人员导入功能（刑满释放/严重精神/重点未成年人）
4 双属地功能，相关统计页面统计及评价操作，原属地可见（可编辑，不可评价）新属地（不可编辑，可评价）
5 页面a.b.c要有红黄绿颜色
parent 6a16dbce
正在显示 包含 359 行增加 和 44 行删除
src/main/java/com/scpyun/platform/jilinsscgsdp/bean/entity/KeyPerson.java
......@@ -88,6 +88,13 @@ public class KeyPerson {
private String todoCount;
private String doneCount;
//双属地，有双属地且为原属地标识 1原属地，用于屏蔽评价按钮
private String dualPersonBelong;
//双属地，当前所在属地标识，1当前所属（非原属地） ，用于常规操作按钮判断
private String dualPerson;
private String scopeGrade;
private String scopeAreaId;
public String getDistCard() {
return distCard;
}
......@@ -583,4 +590,20 @@ public class KeyPerson {
public void setDoneCount(String doneCount) {
this.doneCount = doneCount;
}
public String getDualPersonBelong() { return dualPersonBelong; }
public void setDualPersonBelong(String dualPersonBelong) { this.dualPersonBelong = dualPersonBelong; }
public String getDualPerson() { return dualPerson; }
public void setDualPerson(String dualPerson) { this.dualPerson = dualPerson; }
public String getScopeAreaId() { return scopeAreaId; }
public void setScopeAreaId(String scopeAreaId) { this.scopeAreaId = scopeAreaId; }
public String getScopeGrade() { return scopeGrade; }
public void setScopeGrade(String scopeGrade) { this.scopeGrade = scopeGrade; }
}
src/main/java/com/scpyun/platform/jilinsscgsdp/bean/entity/KeyPersonImp.java 0 → 100644
package com.scpyun.platform.jilinsscgsdp.bean.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
/**
* 终端人员
*/
@Data
public class KeyPersonImp {
private String id;
private String sysType;
@ExcelProperty(value = "姓名", index = 0)
private String name;
@ExcelProperty(value = "性别", index = 1)
private String sex;
@ExcelProperty(value = "民族", index = 2)
private String folk;
@ExcelProperty(value = "身份证号", index = 3)
private String cardNo;
@ExcelProperty(value = "本人联系方式", index = 4)
private String phone;
@ExcelProperty(value = "户籍地址", index = 5)
private String registeredResidence;
private String cityId;
private String areaId;
private String streetId;
private String communityId;
private String cityName;
@ExcelProperty(value = "现住址（区县）", index = 6)
private String areaName;
@ExcelProperty(value = "现住址（街道）", index = 7)
private String streetName;
@ExcelProperty(value = "现住址（社区）", index = 8)
private String communityName;
@ExcelProperty(value = "现住址（详细地址）", index = 9)
private String address;
@ExcelProperty(value = "是否涉及矛盾纠纷", index = 10)
private String involvingConflictsDisputes;
@ExcelProperty(value = "矛盾纠纷风险等级", index = 11)
private String riskLevel;
@ExcelProperty(value = {"高度关注情形", "重新犯罪"}, index = 12)
private String criminalTendency;
@ExcelProperty(value = {"高度关注情形", "黑恶"}, index = 13)
private String evil;
@ExcelProperty(value = {"高度关注情形", "恶性犯罪"}, index = 14)
private String heinousCrime;
@ExcelProperty(value = {"高度关注情形", "邪教"}, index = 15)
private String cult;
@ExcelProperty(value = {"高度关注情形", "三无人员"}, index = 16)
private String threeNoesPerson;
@ExcelProperty(value = "安置帮教责任单位", index = 17)
private String responsibleCompanyByAssistance;
@ExcelProperty(value = "安置帮办责任人", index = 18)
private String responsiblePersonByAssistance;
@ExcelProperty(value = "重点人责任单位", index = 19)
private String responsibleCompanyByKeyPersonnel;
@ExcelProperty(value = "重点人员责任人", index = 20)
private String responsiblePersonKeyPersonnel;
private String ratingScore;
private String hazardAssessmentLevel;
private String responsiblePerson;
private String responsibleCompany;
private String criminalTendencySituation;
private String lettersVisitsType;
private String relatedPersonRelation;
private String relatedPersonPhone;
private String relatedPersonName;
private String relatedPersonAddress;
private String controlCompanySupervisor;
private String controlCompanySupervisorPerson;
private String createDate;
private String updateDate;
private String createUser;
private String updateUser;
private String region;
private String remarks;
private String count;
private String highly_concerned_situation;
}
src/main/java/com/scpyun/platform/jilinsscgsdp/bean/entity/KeyPersonRatingHistory.java
......@@ -21,6 +21,7 @@ public class KeyPersonRatingHistory {
private String summaryId;
private String ratingPersonnel;
private String ratingCompany;
private String dualMark;
public String getId() {
return id;
}
......@@ -180,4 +181,8 @@ public class KeyPersonRatingHistory {
public void setRatingCompany(String ratingCompany) {
this.ratingCompany = ratingCompany;
}
public String getDualMark() { return dualMark; }
public void setDualMark(String dualMark) { this.dualMark = dualMark; }
}
src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyPersonRatingHistoryServiceImpl.java
package com.scpyun.platform.jilinsscgsdp.service.impl;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.read.builder.ExcelReaderBuilder;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.alibaba.fastjson.JSON;
import com.obs.services.model.ObsObject;
import com.scpyun.base.bean.Page;
import com.scpyun.base.core.annotation.Api;
import com.scpyun.base.core.annotation.ApiOperation;
......@@ -7,11 +13,29 @@ import com.scpyun.base.core.exception.CustomException;
import com.scpyun.base.core.utils.StringUtils;
import com.scpyun.base.db.service.CommonService;
import com.scpyun.platform.jilinsscgsdp.bean.entity.KeyPerson;
import com.scpyun.platform.jilinsscgsdp.bean.entity.KeyPersonImp;
import com.scpyun.platform.jilinsscgsdp.bean.entity.KeyPersonRatingHistory;
import com.scpyun.platform.jilinsscgsdp.utils.DataScopeUtil;
import com.scpyun.platform.jilinsscgsdp.utils.FileDataListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -29,13 +53,55 @@ public class KeyPersonRatingHistoryServiceImpl {
@Autowired
CommonService commonService;
private static final Logger log = LoggerFactory.getLogger(KeyPersonRatingHistoryServiceImpl.class);
private final String SUCCESS = "success";
private String namespace = "com.scpyun.platform.standard.jilinsscgsdp.keyPersonRatingHistory.";
@ApiOperation(value = "查询评分历史列表", desc = "查询评分历史列表")
public Page<KeyPersonRatingHistory> selectRatingHistoryList(Page<KeyPersonRatingHistory> page) {
Map<String, Object> user = (Map<String, Object>) page.getParams().get("_user");
if (user != null) {
Map<String, String> pos = DataScopeUtil.getPosition(user);
Map<String, Object> setMap = new HashMap<>();
setMap.put("scope_grade", pos.get("grade"));
setMap.put("scope_area_id", pos.get("area_id"));
page.getParams().put("_scope", setMap);
}
Page<KeyPersonRatingHistory> keyPersonRatingHistoryPageList = commonService.findPage(namespace + "selectRatingHistoryList", page);
return keyPersonRatingHistoryPageList;
}
@ApiOperation(value = "导入人员信息", desc = "导入人员信息")
public Map<String, Object> importExcel(Map<String, Object> map, MultipartFile file) {
FileDataListener listener = new FileDataListener(commonService, namespace, map);
try {
EasyExcel.read(file.getInputStream(), KeyPersonImp.class, listener).sheet().headRowNumber(2).doRead();
} catch (IOException e) {
throw new CustomException("导入失败");
}
return listener.getResult();
}
@ApiOperation(value = "导入模板下载", desc = "导入模板下载")
public void templateDownload(Map<String, Object> map, HttpServletResponse response) {
response.setContentType("application/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
try {
String fileName = URLEncoder.encode("未成年人导入模板", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
response.setHeader("filename", fileName + ".xlsx");
response.setHeader("Access-Control-Expose-Headers", "filename,Content-Disposition");
String pdfFilePath = "keyPersonImp.xlsx";
Resource resource = new ClassPathResource(pdfFilePath);
InputStream is = resource.getInputStream();
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(is).excelType(ExcelTypeEnum.XLSX).build();
excelWriter.finish();
} catch (Exception e) {
log.error("下载模版异常", e);
}
}
}
src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyPersonRatingServiceImpl.java
......@@ -11,10 +11,12 @@ import com.scpyun.base.db.service.CommonService;
import com.scpyun.platform.jilinsscgsdp.bean.entity.KeyPersonRatingHistory;
import com.scpyun.platform.jilinsscgsdp.enums.ScoreCategoryEnum;
import com.scpyun.platform.jilinsscgsdp.utils.DataScopeUtil;
import com.scpyun.platform.jilinsscgsdp.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.ParseException;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
......@@ -154,6 +156,18 @@ public class KeyPersonRatingServiceImpl {
}
} else {
historyId = map.get("historyId").toString();
//可能存在超期评分，未超期评分，状态为1，超期评分后，状态为3；根据当前时间和计划结束时间进行对比
String do_status = "1";
Map<String, Object> _map = new HashMap<>();
_map.put("id", historyId);
Map<String, Object> historyObj = commonService.getObject(namespace + "selectRatingHistoryById", _map);
do_status = historyObj.get("do_status").toString();
Date endData = (Date)historyObj.get("plan_end_data");
if("2".equals(historyObj.get("do_status")) && new Date().compareTo(endData) > 0) {
do_status = "3";
}
//需要更新，jl_key_person_rating_summary表数据
Map<String, Object> updateSummaryMap = new HashMap<>();
updateSummaryMap.put("rating_dict_type", map.get("ratingDictType"));
......@@ -166,6 +180,8 @@ public class KeyPersonRatingServiceImpl {
updateHistoryMap.put("rating_dict_type", map.get("ratingDictType"));
updateHistoryMap.put("key_person_id", map.get("id"));
updateHistoryMap.put("_user", map.get("_user"));
updateHistoryMap.put("id", historyId);
updateHistoryMap.put("do_status", do_status);
commonService.update(namespace + "updateHistory", updateHistoryMap);
}
......@@ -189,6 +205,7 @@ public class KeyPersonRatingServiceImpl {
sub.put("rating_history_id", historyId);
sub.put("key_person_rating_summary_id",summaryId);
sub.put("sort",sub.get("sort"));
sub.put("remarks",sub.get("remarks"));
if (commonService.insert(namespace + "insertRatingDetails", sub) != 1) {
throw new CustomException("添加失败");
}
......@@ -225,6 +242,15 @@ public class KeyPersonRatingServiceImpl {
summaryMap.put("is_history", 1);//最新数据
summaryMap.put("_user", map.get("_user"));
summaryMap.put("rating_users", map.get("ratingUsers"));
summaryMap.put("rating_custom_time", map.get("ratingTime").toString().replace("T", " ").substring(0,19));
// try {
// summaryMap.put("rating_custom_time", DateUtil.parseTime(map.get("ratingTime").toString().replace("T", " ").substring(0,19)));
// } catch (ParseException e) {
// summaryMap.put("rating_custom_time", DateUtil.getCurrentTime());
// }
if (commonService.insert(namespace + "insertPersonRatingSummary", summaryMap) != 1) {
throw new CustomException("添加失败");
}
......
src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyPersonStatisticsImpl.java
......@@ -27,12 +27,18 @@ public class KeyPersonStatisticsImpl {
*/
@ApiOperation(value = "评分统计数据", desc = "评分统计数据")
public Map<String, Object> getScoreStatistics(Map<String, Object> map) {
Object _user = map.get("_user");
if (_user != null) {
Map<String, String> pos = DataScopeUtil.getPosition(_user);
map.put("scope_grade", pos.get("grade"));
map.put("scope_area_id", pos.get("area_id"));
}
// 获取重点人员总数
Map<String, Object> peopleCountMap = commonService.getObject(namespace + "selectPeopleCount", new HashMap<>());
Map<String, Object> peopleCountMap = commonService.getObject(namespace + "selectPeopleCount", map);
Map<String, Object> mentalPatient = commonService.getObject(namespace + "selectMentalPatientRatingCount", new HashMap<>());
Map<String, Object> minors = commonService.getObject(namespace + "selectMinorsRatingCount", new HashMap<>());
Map<String, Object> released = commonService.getObject(namespace + "selectReleasedRatingCount", new HashMap<>());
Map<String, Object> mentalPatient = commonService.getObject(namespace + "selectMentalPatientRatingCount", map);
Map<String, Object> minors = commonService.getObject(namespace + "selectMinorsRatingCount", map);
Map<String, Object> released = commonService.getObject(namespace + "selectReleasedRatingCount", map);
// 构建返回结果
Map<String, Object> result = new HashMap<>();
......@@ -237,24 +243,28 @@ public class KeyPersonStatisticsImpl {
int mentalUncompleted = getIntValue(mentalPatientMap, "total_pending");
int mentalNearOverdue = getIntValue(mentalPatientMap, "total_overdue_pending");
int mentalOverdue = getIntValue(mentalPatientMap, "total_overdue");
int mentalOverdueDone = getIntValue(mentalPatientMap, "total_overdue_done");
// 未成年人统计
int minorsCompleted = getIntValue(minorsMap, "total_done");
int minorsUncompleted = getIntValue(minorsMap, "total_pending");
int minorsNearOverdue = getIntValue(minorsMap, "total_overdue_pending");
int minorsOverdue = getIntValue(minorsMap, "total_overdue");
int minorsOverdueDone = getIntValue(minorsMap, "total_overdue_done");
// 刑满释放人员统计
int releasedCompleted = getIntValue(releasedMap, "total_done");
int releasedUncompleted = getIntValue(releasedMap, "total_pending");
int releasedNearOverdue = getIntValue(releasedMap, "total_overdue_pending");
int releasedOverdue = getIntValue(releasedMap, "total_overdue");
int releasedOverdueDone = getIntValue(releasedMap, "total_overdue_done");
// 计算汇总数据
int summaryCompleted = mentalCompleted + minorsCompleted + releasedCompleted;
int summaryUncompleted = mentalUncompleted + minorsUncompleted + releasedUncompleted;
int summaryNearOverdue = mentalNearOverdue + minorsNearOverdue + releasedNearOverdue;
int summaryOverdue = mentalOverdue + minorsOverdue + releasedOverdue;
int summaryOverdueDone = mentalOverdueDone + minorsOverdueDone + releasedOverdueDone;
int summaryTotal = summaryCompleted + summaryUncompleted + summaryNearOverdue + summaryOverdue;
// 构建汇总数据
......@@ -264,6 +274,7 @@ public class KeyPersonStatisticsImpl {
summary.put("uncompleted", summaryUncompleted);
summary.put("nearOverdue", summaryNearOverdue);
summary.put("overdue", summaryOverdue);
summary.put("overdueDone", summaryOverdueDone);
result.put("summary", summary);
// 构建精神病患者数据
......@@ -273,6 +284,7 @@ public class KeyPersonStatisticsImpl {
mentalPatient.put("uncompleted", mentalUncompleted);
mentalPatient.put("nearOverdue", mentalNearOverdue);
mentalPatient.put("overdue", mentalOverdue);
mentalPatient.put("overdueDone", mentalOverdue);
result.put("mentalPatient", mentalPatient);
// 构建刑满释放人员数据
......@@ -282,6 +294,7 @@ public class KeyPersonStatisticsImpl {
released.put("uncompleted", releasedUncompleted);
released.put("nearOverdue", releasedNearOverdue);
released.put("overdue", releasedOverdue);
released.put("overdueDone", minorsOverdueDone);
result.put("released", released);
// 构建未成年人数据
......@@ -291,6 +304,7 @@ public class KeyPersonStatisticsImpl {
minors.put("uncompleted", minorsUncompleted);
minors.put("nearOverdue", minorsNearOverdue);
minors.put("overdue", minorsOverdue);
minors.put("overdueDone", releasedOverdueDone);
result.put("minors", minors);
return result;
......
src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/MurderManagementServiceImpl.java
......@@ -10,6 +10,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.fill.FillConfig;
import com.alibaba.fastjson.JSONObject;
import com.scpyun.base.bean.Page;
import com.scpyun.base.bean.User;
import com.scpyun.base.core.annotation.Api;
import com.scpyun.base.core.annotation.ApiOperation;
import com.scpyun.base.core.exception.CustomException;
......@@ -28,6 +29,8 @@ import com.scpyun.platform.jilinsscgsdp.utils.DateUtil;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
......@@ -143,7 +146,8 @@ public class MurderManagementServiceImpl {
@ApiOperation(value = "高度关注情形按类别统计，分别按类别统计", desc = "")
public List<KeyPerson> findKeyPersonStatistics(KeyPerson keyPerson) {
return commonService.findList(nameSpace + "findKeyPersonStatistics", keyPerson);
String changchunMark = DataScopeUtil.isChanChun(keyPerson.get_user()) ? "_changchun" : "";
return commonService.findList(nameSpace + "findKeyPersonStatistics" + changchunMark, keyPerson);
}
@ApiOperation(value = "新增重点人员信息", desc = "")
......@@ -155,6 +159,7 @@ public class MurderManagementServiceImpl {
keyPerson.setId(UUIDUtil.getUUID());
String communityId = keyPerson.getCommunityId();
if(StrUtil.isNotBlank(communityId)){
keyPerson.setRegion("1");//地区：1 省内(默认)，2 省外，3 国外
List<KeyPerson> list = commonService.findList(nameSpace + "checkCardNoRepeatList", keyPerson);
if (list.size()>0){
throw new CustomException("社区和身份证重复无法新增！");
......@@ -262,31 +267,52 @@ public class MurderManagementServiceImpl {
@ApiOperation(value = "重点人员统计", desc = "")
public List<KeyPerson> findKeyPersonStatisticsForType(KeyPerson keyPerson) {
return commonService.findList(nameSpace + "findKeyPersonStatisticsForType", keyPerson);
String changchunMark = DataScopeUtil.isChanChun(keyPerson.get_user()) ? "_changchun" : "";
User _user = keyPerson.get_user();
if (_user != null) {
Map<String, String> pos = DataScopeUtil.getPosition(_user);
keyPerson.setScopeAreaId(pos.get("grade"));
keyPerson.setScopeAreaId(pos.get("area_id"));
}
return commonService.findList(nameSpace + "findKeyPersonStatisticsForType" + changchunMark, keyPerson);
}
@ApiOperation(value = "重点人员统计CountAll", desc = "")
public KeyPerson keyPersonStatisticsForTypeAll(KeyPerson keyPerson) {
return commonService.getObject(nameSpace + "keyPersonStatisticsForTypeAll", keyPerson);
String changchunMark = DataScopeUtil.isChanChun(keyPerson.get_user()) ? "_changchun" : "";
User _user = keyPerson.get_user();
if (_user != null) {
Map<String, String> pos = DataScopeUtil.getPosition(_user);
keyPerson.setScopeAreaId(pos.get("grade"));
keyPerson.setScopeAreaId(pos.get("area_id"));
}
return commonService.getObject(nameSpace + "keyPersonStatisticsForTypeAll" + changchunMark, keyPerson);
}
@ApiOperation(value = "按照城市、区、街道、社区（分角色展示内容）统计重点人员数量", desc = "")
public List<KeyPerson> keyPersonStatisticsForChunk(KeyPerson keyPerson) {
String changchunMark = DataScopeUtil.isChanChun(keyPerson.get_user()) ? "_changchun" : "";
User _user = keyPerson.get_user();
if (_user != null) {
Map<String, String> pos = DataScopeUtil.getPosition(_user);
keyPerson.setScopeAreaId(pos.get("grade"));
keyPerson.setScopeAreaId(pos.get("area_id"));
}
if (keyPerson.get_user().getCompany_grade().equals("3")) {
// city
return commonService.findList(nameSpace + "keyPersonStatisticsForCity", keyPerson);
return commonService.findList(nameSpace + "keyPersonStatisticsForCity" + changchunMark, keyPerson);
} else if (keyPerson.get_user().getCompany_grade().equals("4")) {
// area
return commonService.findList(nameSpace + "keyPersonStatisticsForArea", keyPerson);
return commonService.findList(nameSpace + "keyPersonStatisticsForArea" + changchunMark, keyPerson);
} else if (keyPerson.get_user().getCompany_grade().equals("5")) {
// street
return commonService.findList(nameSpace + "keyPersonStatisticsForStreet", keyPerson);
return commonService.findList(nameSpace + "keyPersonStatisticsForStreet" + changchunMark, keyPerson);
} else if (keyPerson.get_user().getCompany_grade().equals("6")) {
// community
return commonService.findList(nameSpace + "keyPersonStatisticsForCommunity", keyPerson);
return commonService.findList(nameSpace + "keyPersonStatisticsForCommunity" + changchunMark, keyPerson);
} else if (keyPerson.get_user().getCompany_grade().equals("2")) {
// province
return commonService.findList(nameSpace + "keyPersonStatisticsForProvince", keyPerson);
return commonService.findList(nameSpace + "keyPersonStatisticsForProvince" + changchunMark, keyPerson);
} else {
return null;
}
......@@ -395,7 +421,14 @@ public class MurderManagementServiceImpl {
@ApiOperation(value = "按照矛盾等级统计重点人员数量", desc = "")
public Map<String, Object> keyPersonStatisticsForRiskLevel(KeyPerson keyPerson) {
List<KeyPerson> list = commonService.findList(nameSpace + "keyPersonStatisticsForRiskLevel", keyPerson);
String changchunMark = DataScopeUtil.isChanChun(keyPerson.get_user()) ? "_changchun" : "";
User _user = keyPerson.get_user();
if (_user != null) {
Map<String, String> pos = DataScopeUtil.getPosition(_user);
keyPerson.setScopeAreaId(pos.get("grade"));
keyPerson.setScopeAreaId(pos.get("area_id"));
}
List<KeyPerson> list = commonService.findList(nameSpace + "keyPersonStatisticsForRiskLevel" + changchunMark, keyPerson);
Map<String, Integer> map = new HashMap<>();
map.put("1", 0);
map.put("2", 0);
......
src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/keyPersonMinorServiceImpl.java
......@@ -82,9 +82,9 @@ public class keyPersonMinorServiceImpl {
page.getParams().put("_scope", setMap);
}
Page<KeyPerson> keyPersonList = commonService.findPage(nameSpace + "findKeyPersonList", page);
// for (KeyPerson keyPerson : keyPersonList.getResults()) {
// keyPerson.setKeyPersonHighlyConcernedRel(commonService.findList(nameSpace + "findKeyPersonHighlyConcernedRelListByKeyPersonId", keyPerson));
// }
for (KeyPerson keyPerson : keyPersonList.getResults()) {
keyPerson.setKeyPersonHighlyConcernedRel(commonService.findList(nameSpace + "findKeyPersonHighlyConcernedRelListByKeyPersonId", keyPerson));
}
return keyPersonList;
}
......@@ -164,15 +164,15 @@ public class keyPersonMinorServiceImpl {
if (commonService.insert(nameSpace + "insertKeyPersonById", keyPerson) == 0) {
throw new CustomException("操作失败!");
}
// keyPerson.getKeyPersonHighlyConcernedRel().forEach(keyPersonHighlyConcernedRel -> {
// keyPersonHighlyConcernedRel.setKeyPersonId(keyPerson.getId());
// keyPersonHighlyConcernedRel.setCardNo(keyPerson.getCardNo());
// keyPersonHighlyConcernedRel.setId(UUIDUtil.getUUID());
// keyPersonHighlyConcernedRel.set_user(keyPerson.get_user());
// if (commonService.insert(nameSpace + "insertKeyPersonHighlyConcernedRel", keyPersonHighlyConcernedRel) == 0) {
// throw new CustomException("操作失败!");
// }
// });
keyPerson.getKeyPersonHighlyConcernedRel().forEach(keyPersonHighlyConcernedRel -> {
keyPersonHighlyConcernedRel.setKeyPersonId(keyPerson.getId());
keyPersonHighlyConcernedRel.setCardNo(keyPerson.getCardNo());
keyPersonHighlyConcernedRel.setId(UUIDUtil.getUUID());
keyPersonHighlyConcernedRel.set_user(keyPerson.get_user());
if (commonService.insert(nameSpace + "insertKeyPersonHighlyConcernedRel", keyPersonHighlyConcernedRel) == 0) {
throw new CustomException("操作失败!");
}
});
return "success";
}
void checkFied(KeyPerson keyPerson){
......@@ -248,16 +248,16 @@ public class keyPersonMinorServiceImpl {
});
}
}
// commonService.delete(nameSpace + "deleteKeyPersonHighlyConcernedRelByPersonId", keyPerson);
// keyPerson.getKeyPersonHighlyConcernedRel().forEach(keyPersonHighlyConcernedRel -> {
// keyPersonHighlyConcernedRel.setKeyPersonId(keyPerson.getId());
// keyPersonHighlyConcernedRel.setCardNo(keyPerson.getCardNo());
// keyPersonHighlyConcernedRel.setId(UUIDUtil.getUUID());
// keyPersonHighlyConcernedRel.set_user(keyPerson.get_user());
// if (commonService.insert(nameSpace + "insertKeyPersonHighlyConcernedRel", keyPersonHighlyConcernedRel) == 0) {
// throw new CustomException("操作失败!");
// }
// });
commonService.delete(nameSpace + "deleteKeyPersonHighlyConcernedRelByPersonId", keyPerson);
keyPerson.getKeyPersonHighlyConcernedRel().forEach(keyPersonHighlyConcernedRel -> {
keyPersonHighlyConcernedRel.setKeyPersonId(keyPerson.getId());
keyPersonHighlyConcernedRel.setCardNo(keyPerson.getCardNo());
keyPersonHighlyConcernedRel.setId(UUIDUtil.getUUID());
keyPersonHighlyConcernedRel.set_user(keyPerson.get_user());
if (commonService.insert(nameSpace + "insertKeyPersonHighlyConcernedRel", keyPersonHighlyConcernedRel) == 0) {
throw new CustomException("操作失败!");
}
});
return "success";
}
......
src/main/java/com/scpyun/platform/jilinsscgsdp/utils/DataScopeUtil.java
package com.scpyun.platform.jilinsscgsdp.utils;
import com.alibaba.fastjson.JSONObject;
import com.scpyun.base.bean.User;
import com.scpyun.base.db.service.CommonService;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -142,6 +145,29 @@ public class DataScopeUtil {
}
}
/**
* 是否是长春
* @param _user
* @return true:是 false：否
*/
public static Boolean isChanChun(User _user) {
Map<String, Object> map = new HashMap<>();
BeanWrapper beanWrapper = new BeanWrapperImpl(_user);
for (java.beans.PropertyDescriptor pd : beanWrapper.getPropertyDescriptors()) {
String propertyName = pd.getName();
// 跳过class属性
if (!"class".equals(propertyName)) {
Object propertyValue = beanWrapper.getPropertyValue(propertyName);
map.put(propertyName, propertyValue);
}
}
if(map.get("company_id") == null) {
return false;
}else{
return isChanChun(map);
}
}
public static Map<String, Object> resetUser(Map<String, Object> map) {
Object _user = map.get("_user");
Map<String, Object> queryMap = new HashMap<>();
......
src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyPersonRatingDao.xml
......@@ -141,7 +141,8 @@
rating_description,
company_code,
create_by,
create_time
create_time,
rating_remarks
) VALUES (
#{id},
#{rating_dict_type},
......@@ -156,7 +157,8 @@
#{rating_description},
#{_user.company_code},
#{_user.id},
NOW()
NOW(),
#{remarks}
)
</insert>
......@@ -187,7 +189,9 @@
rating,
is_history,
create_by,
create_time
create_time,
rating_users,
rating_custom_time
) VALUES (
#{id},
#{rating_dict_type},
......@@ -200,7 +204,9 @@
#{rating},
#{is_history},
#{_user.id},
NOW()
NOW(),
#{rating_users},
STR_TO_DATE(#{rating_custom_time}, '%Y-%m-%d %H:%i:%s')
)
<!--<selectKey keyProperty="count" resultType="int" order="BEFORE">
SELECT COUNT(1) FROM jl_key_person_rating_summary WHERE id = #{key_person_rating_summary_id}
......@@ -274,9 +280,11 @@
kprs.key_person_id,
su.name rating_personnel,
so.name rating_company,
DATE_FORMAT(kprs.rating_time,'%Y-%m-%d %T') rating_time,
DATE_FORMAT(case when kprs.rating_custom_time is not null then kprs.rating_custom_time else kprs.rating_time end,'%Y-%m-%d %T') rating_time,
kprs.rating_type,
kprs.rating
kprs.rating,
DATE_FORMAT(kprs.rating_custom_time,'%Y-%m-%d %T') rating_custom_time,
kprs.rating_users
from
jl_key_person_rating_summary kprs
LEFT JOIN sys_user su ON kprs.rating_personnel = su.id
......@@ -300,7 +308,8 @@
scoring_project,
IF(is_whether = '1','有','无') is_whether,
details,
company_code
company_code,
rating_remarks
FROM
jl_key_person_rating_details
WHERE
......@@ -357,15 +366,38 @@
UPDATE
jl_key_person_rating_history
SET
do_status = '1',
do_status = #{do_status},
update_by = #{_user.id},
update_time = NOW()
WHERE
key_person_id = #{key_person_id}
AND rating_dict_type = #{rating_dict_type}
AND is_history = '1'
AND id = #{id}
</update>
<select id="selectRatingHistoryById" parameterType="map" resultType="map">
SELECT
id,
rating_dict_type,
key_person_id,
plan_start_data,
plan_end_data,
overdue_date,
is_history,
do_status,
is_overdue,
batch_id,
create_by,
create_time,
update_by,
update_time
FROM
jl_key_person_rating_history
WHERE
id = #{id}
</select>
<select id="findKeyPersonMinorList" parameterType="page" resultType="map">
SELECT
id,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论