src/main/java/org/springblade/common/constant/FtpConstant.java
@@ -52,4 +52,8 @@ */ //String localPath = "/home/zhongsong/anbao/"; String localPath = "D:\\anbao\\"; //minio内网ip String ip = "http://192.168.0.105"; } src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -347,12 +347,11 @@ * @return */ @PostMapping("/queryYearKh") public R queryYearKh(String jurisdiction, String deptid) { public List queryYearKh(String jurisdiction, String deptid) { Calendar cal = Calendar.getInstance(); String year = String.valueOf(cal.get(Calendar.YEAR)); Map<String, String> map = informationService.queryYearKh(year, jurisdiction, deptid); map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序 return R.data(map); List list = informationService.queryYearKh(year, jurisdiction, deptid); return list; } //升序 public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) { src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -61,5 +61,5 @@ * @return */ List<InformationVO> securityPage(IPage<InformationVO> page, @Param("information") InformationVO information); Map<String, String> queryYearKh(String year,String jurisdiction,String deptid); List queryYearKh(String year,String jurisdiction,String deptid); } src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -160,7 +160,7 @@ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'"> WHERE A.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid==''"> <if test="deptid!=null and deptid!=''"> WHERE A.dept_id = #{deptid} </if> </select> @@ -183,7 +183,7 @@ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'"> WHERE A.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid==''"> <if test="deptid!=null and deptid!=''"> WHERE A.dept_id = #{deptid} </if> </select> @@ -210,20 +210,31 @@ WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0 AND dispatch = 0 GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'"> <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> WHERE A.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid==''"> <if test="deptid!=null and deptid!=''"> WHERE A.dept_id = #{deptid} </if> </select> <select id="selectSoil" resultType="java.util.HashMap"> SELECT A.numj, B.numz FROM (SELECT COUNT(*) AS numj, deptid FROM sys_socil GROUP BY deptid) A LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user GROUP BY dept_id) B ON A.deptid = B.dept_id WHERE A.deptid = #{deptid} SELECT IFNULL(A.numj, 0) as numj, IFNULL(B.numz, 0) as numz FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H LEFT JOIN (SELECT COUNT(*) AS numj, dept_id FROM blade_user WHERE soil = 0 AND `status` = 1 AND is_deleted = 0 GROUP BY dept_id) A ON A.dept_id = H.departmentid LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user WHERE `status` = 1 AND is_deleted = 0 GROUP BY dept_id) B ON H.departmentid = B.dept_id <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> WHERE H.jurisdiction = #{jurisdiction} </if> <if test="deptid!=null and deptid!=''"> WHERE H.departmentid = #{deptid} </if> </select> <!--查询培训单位信息(可以报名)--> @@ -252,35 +263,17 @@ </if> </select> <!--查询本年所有月份的客户数量--> <!--查询本年所有月份h合同开始时间的客户数量--> <select id="queryYearKh" resultType="java.util.HashMap"> SELECT COUNT (CASE WHEN MONTH ( s.start_time ) = 1 THEN s.id END ) AS '1', COUNT(CASE WHEN MONTH ( s.start_time ) = 2 THEN s.id END ) AS '2', COUNT(CASE WHEN MONTH ( s.start_time ) = 3 THEN s.id END ) AS '3', COUNT(CASE WHEN MONTH ( s.start_time ) = 4 THEN s.id END ) AS '4', COUNT(CASE WHEN MONTH ( s.start_time ) = 5 THEN s.id END ) AS '5', COUNT(CASE WHEN MONTH ( s.start_time ) = 6 THEN s.id END ) AS '6', COUNT(CASE WHEN MONTH ( s.start_time ) = 7 THEN s.id END ) AS '7', COUNT(CASE WHEN MONTH ( s.start_time ) = 8 THEN s.id END ) AS '8', COUNT(CASE WHEN MONTH ( s.start_time ) = 9 THEN s.id END ) AS '9', COUNT(CASE WHEN MONTH ( s.start_time ) = 10 THEN s.id END ) AS '10', COUNT(CASE WHEN MONTH ( s.start_time ) = 11 THEN s.id END ) AS '11', COUNT(CASE WHEN MONTH ( s.start_time ) = 12 THEN s.id END ) AS '12' FROM sys_dispatcher_unit AS s WHERE YEAR ( s.start_time ) =#{year} AND dept_id IN ( SELECT i.departmentid start_time, end_time FROM sys_information i LEFT JOIN sys_jurisdiction j ON j.id= i.jurisdiction where 1=1 `sys_dispatcher_unit` WHERE YEAR (end_time) >='2021' <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'"> and i.jurisdiction =#{jurisdiction} and jurisdiction =#{jurisdiction} </if> GROUP BY i.departmentid ) <if test="deptid!=null and deptid!=''"> and dept_id =#{deptid} </if> src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -54,7 +54,7 @@ List<Map<Object,Object>> selectDis(String deptid); List<Map<Object,Object>> selectDisp(String deptid,String jurisdiction); List<Map<Object,Object>> selectSoil(String deptid); Map<String, String> queryYearKh(String year,String jurisdiction,String deptid); List queryYearKh(String year,String jurisdiction,String deptid); /** * 查询培训单位信息(可以报名) src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -123,10 +123,11 @@ } @Override public Map<String, String> queryYearKh(String year, String jurisdiction, String deptid) { public List queryYearKh(String year, String jurisdiction, String deptid) { return baseMapper.queryYearKh(year, jurisdiction, deptid); } /** * 查询培训单位信息(可以报名) * @param page src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -22,21 +22,36 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.common.cache.DictCache; import org.springblade.common.cache.ParamCache; import org.springblade.common.enums.DictEnum; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.Func; import org.springblade.modules.FTP.FtpUtil; import org.springblade.modules.information.entity.Information; import org.springblade.modules.information.service.IInformationService; import org.springblade.modules.record.entity.Record; import org.springblade.modules.record.service.IRecordService; import org.springblade.modules.record.vo.RecordVO; import org.springblade.modules.resource.service.IAttachService; import org.springblade.modules.system.entity.Dept; import org.springblade.modules.system.entity.User; import org.springblade.modules.system.service.IDeptService; import org.springblade.modules.system.service.IUserService; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD; import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; /** * 控制器 @@ -51,6 +66,10 @@ public class RecordController extends BladeController { private final IRecordService recordService; private final IDeptService iDeptService; private final IInformationService informationService; private final IUserService userService; private final IAttachService attachService; /** * 详情 @@ -152,6 +171,68 @@ @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入record") public R update(@Valid @RequestBody Record record) { //审核通过 if (record.getType().equals("0")) { //新增组织机构和单位信息 Information information =new Information(); information.setCreditcode(record.getCreditcode()); information.setEnterprisename(record.getEnterprisename()); information.setRepresentative(record.getRepresentative()); information.setEstablishtime(record.getEstablishtime()); information.setRegisteredcapital(record.getRegisteredcapital()); information.setOrganizationcode(record.getOrganizationcode()); information.setRegistrationnumber(record.getRegistrationnumber()); information.setEnterprises(record.getEnterprises()); information.setAddress(record.getAddress()); information.setBusiness(record.getBusiness()); information.setRegion(record.getRegion()); information.setRegistration(record.getRegistration()); information.setIndustry(record.getIndustry()); information.setRepresentativecell(record.getRepresentativecell()); information.setContacts(record.getContacts()); information.setContactscell(record.getContactscell()); Dept dept = new Dept(); //本市公司 if (record.getPtype().equals("2")){ Long i = 1425366663452196865L; dept.setParentId(i); dept.setAncestors("0,1425366663452196865"); } //培训公司 else { Long i = 1420222768149966850L; dept.setParentId(i); dept.setAncestors("0,1420222768149966850"); } dept.setTenantId("000000"); dept.setDeptName(information.getEnterprisename()); dept.setDeptCategory(1); if (iDeptService.submit(dept)) { CacheUtil.clear(SYS_CACHE); // 返回懒加载树更新节点所需字段 Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId()) .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory())); String id = kv.get("id").toString(); information.setDepartmentid(id); } informationService.save(information); //注册用户 User user = new User(); user.setAccount(record.getEnterprisename()); String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD); user.setPassword(initPassword); userService.saveOrUpdate(user); //把附件添加单位id attachService.updat(information.getDepartmentid(),record.getCardid()); String s1 = "update sys_permit set type = " + "'" + 0 + "'" +",approve = " + "'" + record.getApprove() + "'"+ " " +"where id = " + "'" + record.getId() + "'"; FtpUtil.sqlFileUpload(s1); } else { String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + record.getApprove() + "'"+ " " +"where id = " + "'" + record.getId() + "'"; FtpUtil.sqlFileUpload(s1); } return R.status(recordService.updateById(record)); }
@@ -30,6 +30,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.springblade.common.constant.FtpConstant; import org.springblade.common.utils.arg; import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.oss.model.BladeFile; @@ -397,7 +398,7 @@ } attachService.save(attach); String[] split = bladeFile.getName().split("/"); String ip = "http://192.168.0.108/zhba/picture/"; String ip = FtpConstant.ip+"/zhba/picture/"; String imgurl = ip + split[2]; FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in); //数据同步 src/main/java/org/springblade/modules/talk/controller/TalkController.java
@@ -24,6 +24,7 @@ import javax.validation.Valid; import org.springblade.common.constant.FtpConstant; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -97,12 +98,11 @@ @ApiOperation(value = "新增", notes = "传入talk") public R save(@Valid @RequestBody Talk talk) { talkService.save(talk); String ip = "http://192.168.0.108"; String url = ""; String[] split = talk.getImgurl().split(","); for (int i = 0; i < split.length; i++) { String s = split[i].substring(26, split[i].length()); url += ip + s + ","; url += FtpConstant.ip + s + ","; } String substring = url.substring(0, url.length() - 1); talk.setImgurl(substring); @@ -130,12 +130,11 @@ @ApiOperation(value = "修改", notes = "传入talk") public R update(@Valid @RequestBody Talk talk) { talkService.updateById(talk); String ip = "http://192.168.0.108"; String url = ""; String[] split = talk.getImgurl().split(","); for (int i = 0; i < split.length; i++) { String s = split[i].substring(26, split[i].length()); url += ip + s + ","; url += FtpConstant.ip + s + ","; } String substring = url.substring(0, url.length() - 1); talk.setImgurl(substring);
