ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业行业筛选

Browse Source
This commit is contained in:
韩国东 2023-02-16 11:14:17 +08:00
parent 45abdb8317
commit 4d758edb4a
5 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory-dao/src/main/resources/mapper/NewsCntMapper.xml
View File

@ -594,7 +594,7 @@
nc.CreatedOn, nc.CreatedBy, nc.ModifiedOn, nc.ModifiedBy,nc.PublicTime nc.CreatedOn, nc.CreatedBy, nc.ModifiedOn, nc.ModifiedBy,nc.PublicTime
FROM NewsCnt nc FROM NewsCnt nc
LEFT JOIN NewsClass nl ON nc.`NewsClassId` = nl.`NewsClassId` LEFT JOIN NewsClass nl ON nc.`NewsClassId` = nl.`NewsClassId`
WHERE nc.`NewTitle` LIKE #{‘} WHERE nc.`NewTitle` LIKE #{condition}
AND nc.`NewsClassId` IS NOT NULL AND nc.`NewsClassId` IS NOT NULL
<if test="null != newsClassId and '' != newsClassId"> <if test="null != newsClassId and '' != newsClassId">
AND nc.`NewsClassId` = #{newsClassId} AND nc.`NewsClassId` = #{newsClassId}

4
inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml
View File

@ -794,7 +794,9 @@
<!--企业检查--> <!--企业检查-->
<select id="entChkBillPC" resultMap="ResultMapWithBLOBs"> <select id="entChkBillPC" resultMap="ResultMapWithBLOBs">
SELECT cd.* FROM `ChkBillDetail` cd SELECT cd.* FROM `ChkBillDetail` cd
WHERE cd.`BaseInClassId` like concat('%',#{baseInClassId},'%') and del_state = 1 WHERE 1 = 1
<!--and cd.`BaseInClassId` like concat('%',#{baseInClassId},'%') -->
and del_state = 1
AND AND
( (
<foreach collection ="baseSafeClassIds" item="baseSafeClassId" index= "index" separator ="or"> <foreach collection ="baseSafeClassIds" item="baseSafeClassId" index= "index" separator ="or">

2
inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
View File

@ -355,8 +355,6 @@
t2.BaseInClassId BaseInClassIdChild,t2.ClassCode ClassCodeChild, t2.BaseInClassId BaseInClassIdChild,t2.ClassCode ClassCodeChild,
t2.IndustryClassName IndustryClassNameChild,t2.SuperInId as SuperInIdChild t2.IndustryClassName IndustryClassNameChild,t2.SuperInId as SuperInIdChild
from BaseInClass t1 LEFT join BaseInClass t2 on t1.BaseInClassId = t2.SuperInId from BaseInClass t1 LEFT join BaseInClass t2 on t1.BaseInClassId = t2.SuperInId
where t1.SuperInId is null
</select> </select>
<select id="findAll" resultMap="BaseResultMap"> <select id="findAll" resultMap="BaseResultMap">

3
inventory-gov/src/main/java/com/rzyc/controller/BaseController.java
View File

@ -1668,6 +1668,7 @@ public class BaseController {
* */ * */
public List<String>exchange(String id,int type){ public List<String>exchange(String id,int type){
List<String>stringList = new ArrayList<>(); List<String>stringList = new ArrayList<>();
if(StringUtils.isNotBlank(id)){
String [] arr = id.split(","); String [] arr = id.split(",");
if (type == 1){ if (type == 1){
List<BaseSafeClass>baseSafeClasses = baseSafeClassMapper.findAll(); List<BaseSafeClass>baseSafeClasses = baseSafeClassMapper.findAll();
@ -1697,6 +1698,8 @@ public class BaseController {
} }
} }
} }
}
return stringList; return stringList;
} }

10
inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
View File

@ -520,9 +520,8 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
SingleResult singleResult = new SingleResult(); SingleResult singleResult = new SingleResult();
//查询唯一的一个日常检查 //查询唯一的一个日常检查
ChkGovBill chkGovBill = chkGovBillMapper.selectByCompanyId(sysEnterprise.getSysenterpriseid()); ChkGovBill chkGovBill = chkGovBillMapper.selectByCompanyId(sysEnterprise.getSysenterpriseid());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String token = servletRequest.getHeader("userToken"); String userId = getUserId();
String userId = JwtUtil.getTokenMsg(token);
SysUser sysUser = super.getUser(userId); SysUser sysUser = super.getUser(userId);
if (chkGovBill == null){ if (chkGovBill == null){
/** /**
@ -536,7 +535,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
chkGovBill.setBasesafeclassid(sysEnterprise.getBasesafeclassid()); chkGovBill.setBasesafeclassid(sysEnterprise.getBasesafeclassid());
chkGovBill.setChkbillname(sysEnterprise.getEntname() + "日常检查"); chkGovBill.setChkbillname(sysEnterprise.getEntname() + "日常检查");
chkGovBill.setSysEnterpriseId(sysEnterprise.getSysenterpriseid()); chkGovBill.setSysEnterpriseId(sysEnterprise.getSysenterpriseid());
chkGovBill.setChkbillno(simpleDateFormat.format(new Date())); chkGovBill.setChkbillno(DateUtils.getNowDateTimeStr("yyyyMMddHHmmss"));
chkGovBill.setChkbilldate(new Timestamp(System.currentTimeMillis())); chkGovBill.setChkbilldate(new Timestamp(System.currentTimeMillis()));
chkGovBill.setCreatedby(sysUser.getChinaname()); chkGovBill.setCreatedby(sysUser.getChinaname());
chkGovBill.setCreatedon(new Date()); chkGovBill.setCreatedon(new Date());
@ -560,7 +559,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
chkGovBill.setBasesafeclassid(sysEnterprise.getBasesafeclassid()); chkGovBill.setBasesafeclassid(sysEnterprise.getBasesafeclassid());
chkGovBill.setChkbillname(sysEnterprise.getEntname() + "日常检查"); chkGovBill.setChkbillname(sysEnterprise.getEntname() + "日常检查");
chkGovBill.setSysEnterpriseId(sysEnterprise.getSysenterpriseid()); chkGovBill.setSysEnterpriseId(sysEnterprise.getSysenterpriseid());
chkGovBill.setChkbillno(simpleDateFormat.format(new Date())); chkGovBill.setChkbillno(DateUtils.getNowDateTimeStr("yyyyMMddHHmmss"));
chkGovBill.setModifiedby(sysUser.getChinaname()); chkGovBill.setModifiedby(sysUser.getChinaname());
chkGovBill.setModifiedon(new Date()); chkGovBill.setModifiedon(new Date());
chkGovBill.setSysUnitId(sysEnterprise.getManagerDept()); chkGovBill.setSysUnitId(sysEnterprise.getManagerDept());
@ -578,6 +577,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
con.setModifiedby(sysUser.getChinaname()); con.setModifiedby(sysUser.getChinaname());
entBillConMapper.insert(con); entBillConMapper.insert(con);
} }
/**查询检查项*/ /**查询检查项*/
String [] safe = sysEnterprise.getBasesafeclassid().split(","); String [] safe = sysEnterprise.getBasesafeclassid().split(",");
List<String> list = Arrays.asList(safe); List<String> list = Arrays.asList(safe);