机具库存收藏修改
This commit is contained in:
parent
037c8e3e69
commit
e767b6182c
|
|
@ -161,6 +161,7 @@
|
||||||
where bmp.ID=#{id}
|
where bmp.ID=#{id}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
<update id="update" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<update id="update" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
update bm_project
|
update bm_project
|
||||||
<set>
|
<set>
|
||||||
|
|
|
||||||
|
|
@ -1,118 +1,123 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?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" >
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
<mapper namespace="com.bonus.bm.dao.ProjectManageDao" >
|
<mapper namespace="com.bonus.bm.dao.ProjectManageDao">
|
||||||
<resultMap id="ZNode" type="com.bonus.sys.beans.ZNode"></resultMap>
|
<resultMap id="ZNode" type="com.bonus.sys.beans.ZNode"></resultMap>
|
||||||
|
|
||||||
<select id="findByPage" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="findByPage" resultType="com.bonus.bm.beans.ProjectManageBean"
|
||||||
|
parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
select bmp.ID as id,bmp.`NAME` as name,bmp.COMPANY_ID as companyId,bmp.TIME as projectTime,
|
select bmp.ID as id,bmp.`NAME` as name,bmp.COMPANY_ID as companyId,bmp.TIME as projectTime,
|
||||||
bmc.`NAME` as companyName,bmp.TYPE_ID as typeId,bpt.`NAME` as typeName,
|
bmc.`NAME` as companyName,bmp.TYPE_ID as typeId,bpt.`NAME` as typeName,
|
||||||
bmp.VOL_ID as volId,bvl.`NAME` as volName,
|
bmp.VOL_ID as volId,bvl.`NAME` as volName,
|
||||||
bmp.NUM as num,bmp.MANAGER as manager,bmp.NATURE as nature,
|
bmp.NUM as num,bmp.MANAGER as manager,bmp.NATURE as nature,
|
||||||
bmp.TELPHONE as telphone,bmp.PHONE as phone,bmp.FAX as fax,
|
bmp.TELPHONE as telphone,bmp.PHONE as phone,bmp.FAX as fax,
|
||||||
bmp.ADDRESS as address,bmp.REMARKS as remarks,
|
bmp.ADDRESS as address,bmp.REMARKS as remarks,
|
||||||
bmp.MATERIAL_CLERK as materialClerk,bmp.CLERK_PHONE as clerkPhone,
|
bmp.MATERIAL_CLERK as materialClerk,bmp.CLERK_PHONE as clerkPhone,
|
||||||
bmp.IS_BALANCE_END as isBalanceEnd,
|
bmp.IS_BALANCE_END as isBalanceEnd,
|
||||||
bmp.KILOMETER as kilometer
|
bmp.KILOMETER as kilometer
|
||||||
from bm_project bmp
|
from bm_project bmp
|
||||||
LEFT JOIN bm_vol_level bvl on bvl.ID = bmp.VOL_ID
|
LEFT JOIN bm_vol_level bvl on bvl.ID = bmp.VOL_ID
|
||||||
LEFT JOIN bm_project_type bpt on bmp.TYPE_ID = bpt.ID
|
LEFT JOIN bm_project_type bpt on bmp.TYPE_ID = bpt.ID
|
||||||
LEFT JOIN bm_company bmc on bmc.ID = bmp.COMPANY_ID
|
LEFT JOIN bm_company bmc on bmc.ID = bmp.COMPANY_ID
|
||||||
where 1=1 and bmp.IS_ACTIVE=1 and bmp.IS_BALANCE_END=#{param.isBal}
|
where 1=1 and bmp.IS_ACTIVE=1 and bmp.IS_BALANCE_END=#{param.isBal}
|
||||||
|
|
||||||
<if test="param.companyId !=0 and param.companyId !='0'">
|
<if test="param.companyId !=0 and param.companyId !='0'">
|
||||||
and bmp.COMPANY_ID =#{param.companyId}
|
and bmp.COMPANY_ID =#{param.companyId}
|
||||||
</if>
|
</if>
|
||||||
<if test="param.typeId !=0 and param.typeId !='0'">
|
<if test="param.typeId !=0 and param.typeId !='0'">
|
||||||
and bmp.TYPE_ID =#{param.typeId}
|
and bmp.TYPE_ID =#{param.typeId}
|
||||||
</if>
|
</if>
|
||||||
<if test="param.keyWord !=null and param.keyWord !=''">
|
<if test="param.keyWord !=null and param.keyWord !=''">
|
||||||
and (
|
and (
|
||||||
bmp.NAME LIKE CONCAT('%',#{param.keyWord},'%') OR
|
bmp.NAME LIKE CONCAT('%',#{param.keyWord},'%') OR
|
||||||
bmp.NUM LIKE CONCAT('%',#{param.keyWord},'%') OR
|
bmp.NUM LIKE CONCAT('%',#{param.keyWord},'%') OR
|
||||||
bmp.MANAGER LIKE CONCAT('%',#{param.keyWord},'%') OR
|
bmp.MANAGER LIKE CONCAT('%',#{param.keyWord},'%') OR
|
||||||
bmp.NATURE LIKE CONCAT('%',#{param.keyWord},'%') OR
|
bmp.NATURE LIKE CONCAT('%',#{param.keyWord},'%') OR
|
||||||
bmp.TELPHONE LIKE CONCAT('%',#{param.keyWord},'%') OR
|
bmp.TELPHONE LIKE CONCAT('%',#{param.keyWord},'%') OR
|
||||||
bmp.MATERIAL_CLERK LIKE CONCAT('%',#{param.keyWord},'%')
|
bmp.MATERIAL_CLERK LIKE CONCAT('%',#{param.keyWord},'%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
<if test="param.startTime !='' and param.endTime =='' ">
|
<if test="param.startTime !='' and param.endTime =='' ">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
and bmp.TIME > #{param.startTime}
|
and bmp.TIME > #{param.startTime}
|
||||||
]]>
|
]]>
|
||||||
</if>
|
</if>
|
||||||
<if test="param.startTime =='' and param.endTime !='' ">
|
<if test="param.startTime =='' and param.endTime !='' ">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
and bmp.TIME <#{param.endTime}
|
and bmp.TIME <#{param.endTime}
|
||||||
]]>
|
]]>
|
||||||
</if>
|
</if>
|
||||||
<if test="param.startTime !='' and param.endTime !='' ">
|
<if test="param.startTime !='' and param.endTime !='' ">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
and ( bmp.TIME > #{param.startTime}
|
and ( bmp.TIME > #{param.startTime}
|
||||||
and bmp.TIME < #{param.endTime}
|
and bmp.TIME < #{param.endTime}
|
||||||
)
|
)
|
||||||
]]>
|
]]>
|
||||||
</if>
|
</if>
|
||||||
ORDER BY bmp.TIME desc
|
ORDER BY bmp.TIME desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getVolLever" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="getVolLever" resultType="com.bonus.bm.beans.ProjectManageBean"
|
||||||
SELECT bpt.ID,bpt.`NAME` from bm_vol_level bpt
|
parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
|
SELECT bpt.ID, bpt.`NAME`
|
||||||
|
from bm_vol_level bpt
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getProjectType" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="getProjectType" resultType="com.bonus.bm.beans.ProjectManageBean"
|
||||||
SELECT bpt.ID,bpt.`NAME` from bm_project_type bpt
|
parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
|
SELECT bpt.ID, bpt.`NAME`
|
||||||
|
from bm_project_type bpt
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findWorkTree" resultMap="ZNode">
|
<select id="findWorkTree" resultMap="ZNode">
|
||||||
SELECT bmp.ID,bmp.`NAME`,bmp.TYPE_ID as pId
|
SELECT bmp.ID, bmp.`NAME`, bmp.TYPE_ID as pId
|
||||||
FROM bm_project bmp
|
FROM bm_project bmp
|
||||||
LEFT JOIN bm_vol_level bvl ON bmp.TYPE_ID = bvl.ID
|
LEFT JOIN bm_vol_level bvl ON bmp.TYPE_ID = bvl.ID
|
||||||
WHERE bmp.IS_ACTIVE = '1'
|
WHERE bmp.IS_ACTIVE = '1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="projectTree" resultMap="ZNode" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="projectTree" resultMap="ZNode" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
SELECT bmp.ID,bmp.`NAME`,concat('gs',bmp.COMPANY_ID) as pId
|
SELECT bmp.ID,bmp.`NAME`,concat('gs',bmp.COMPANY_ID) as pId
|
||||||
FROM bm_project bmp
|
FROM bm_project bmp
|
||||||
left join bm_company bmc on bmc.ID = bmp.COMPANY_ID
|
left join bm_company bmc on bmc.ID = bmp.COMPANY_ID
|
||||||
WHERE 1 = 1
|
WHERE 1 = 1
|
||||||
<if test="name != null and name != ''">
|
<if test="name != null and name != ''">
|
||||||
and bmp.`NAME` LIKE CONCAT('%',#{name},'%')
|
and bmp.`NAME` LIKE CONCAT('%',#{name},'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="keyWord != null and keyWord != ''">
|
<if test="keyWord != null and keyWord != ''">
|
||||||
and bmp.`NAME` LIKE CONCAT('%',#{keyWord},'%')
|
and bmp.`NAME` LIKE CONCAT('%',#{keyWord},'%')
|
||||||
</if>
|
</if>
|
||||||
union
|
union
|
||||||
SELECT DISTINCT concat('gs',bmc.ID) as id,bmc.`NAME`,'0' as pId
|
SELECT DISTINCT concat('gs',bmc.ID) as id,bmc.`NAME`,'0' as pId
|
||||||
from bm_company bmc
|
from bm_company bmc
|
||||||
LEFT JOIN bm_project bmp on bmp.COMPANY_ID = bmc.ID
|
LEFT JOIN bm_project bmp on bmp.COMPANY_ID = bmc.ID
|
||||||
WHERE bmp.ID is not NULL
|
WHERE bmp.ID is not NULL
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="projectTreeByUnitId" resultMap="ZNode" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="projectTreeByUnitId" resultMap="ZNode" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
SELECT a.*
|
SELECT a.*
|
||||||
FROM (
|
FROM (
|
||||||
SELECT DISTINCT bmp.ID,bmp.`NAME`,concat('gs',bmp.COMPANY_ID) as pId
|
SELECT DISTINCT bmp.ID,bmp.`NAME`,concat('gs',bmp.COMPANY_ID) as pId
|
||||||
FROM bm_project bmp
|
FROM bm_project bmp
|
||||||
left join bm_company bmc on bmc.ID = bmp.COMPANY_ID
|
left join bm_company bmc on bmc.ID = bmp.COMPANY_ID
|
||||||
WHERE 1 = 1
|
WHERE 1 = 1
|
||||||
<if test="keyWord != null and keyWord != ''">
|
<if test="keyWord != null and keyWord != ''">
|
||||||
and bmp.`NAME` LIKE CONCAT('%',#{keyWord},'%')
|
and bmp.`NAME` LIKE CONCAT('%',#{keyWord},'%')
|
||||||
</if>
|
</if>
|
||||||
union
|
union
|
||||||
SELECT DISTINCT concat('gs',bmc.ID) as id,bmc.`NAME`,'0' as pId
|
SELECT DISTINCT concat('gs',bmc.ID) as id,bmc.`NAME`,'0' as pId
|
||||||
from bm_company bmc
|
from bm_company bmc
|
||||||
LEFT JOIN bm_project bmp on bmp.COMPANY_ID = bmc.ID
|
LEFT JOIN bm_project bmp on bmp.COMPANY_ID = bmc.ID
|
||||||
WHERE bmp.ID is not NULL
|
WHERE bmp.ID is not NULL
|
||||||
)a LEFT JOIN wf_lease_agreement bama on bama.PROJECT = a.ID
|
)a LEFT JOIN wf_lease_agreement bama on bama.PROJECT = a.ID
|
||||||
WHERE bama.ID is not NULL
|
WHERE bama.ID is not NULL
|
||||||
<if test="unitId != null and unitId != '' ">
|
<if test="unitId != null and unitId != '' ">
|
||||||
and bama.LEASE_COMPANY = #{unitId}
|
and bama.LEASE_COMPANY = #{unitId}
|
||||||
</if>
|
</if>
|
||||||
<if test='isBalanceEnd == "0"'>
|
<if test='isBalanceEnd == "0"'>
|
||||||
and bama.IS_BALANCE = 1
|
and bama.IS_BALANCE = 1
|
||||||
</if>
|
</if>
|
||||||
<if test='isBalanceEnd == "1"'>
|
<if test='isBalanceEnd == "1"'>
|
||||||
and bama.IS_BALANCE = 0
|
and bama.IS_BALANCE = 0
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="insert" parameterType="com.bonus.bm.beans.ProjectManageBean" useGeneratedKeys="true" keyProperty="id">
|
<insert id="insert" parameterType="com.bonus.bm.beans.ProjectManageBean" useGeneratedKeys="true" keyProperty="id">
|
||||||
|
|
@ -170,7 +175,7 @@
|
||||||
MATERIAL_CLERK,
|
MATERIAL_CLERK,
|
||||||
</if>
|
</if>
|
||||||
<if test="kilometer != null">
|
<if test="kilometer != null">
|
||||||
KILOMETER,
|
KILOMETER,
|
||||||
</if>
|
</if>
|
||||||
<if test="clerkPhone !=null">
|
<if test="clerkPhone !=null">
|
||||||
CLERK_PHONE,
|
CLERK_PHONE,
|
||||||
|
|
@ -182,9 +187,9 @@
|
||||||
<if test="name !=null">
|
<if test="name !=null">
|
||||||
#{name},
|
#{name},
|
||||||
</if>
|
</if>
|
||||||
<if test="num !=null">
|
<if test="num !=null">
|
||||||
#{num},
|
#{num},
|
||||||
</if>
|
</if>
|
||||||
<if test="companyId1 !=null">
|
<if test="companyId1 !=null">
|
||||||
#{companyId1},
|
#{companyId1},
|
||||||
</if>
|
</if>
|
||||||
|
|
@ -233,7 +238,7 @@
|
||||||
#{materialClerk},
|
#{materialClerk},
|
||||||
</if>
|
</if>
|
||||||
<if test="kilometer != null">
|
<if test="kilometer != null">
|
||||||
#{kilometer},
|
#{kilometer},
|
||||||
</if>
|
</if>
|
||||||
<if test="clerkPhone !=null">
|
<if test="clerkPhone !=null">
|
||||||
#{clerkPhone},
|
#{clerkPhone},
|
||||||
|
|
@ -242,27 +247,28 @@
|
||||||
NOW(),
|
NOW(),
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<select id="find" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="find" resultType="com.bonus.bm.beans.ProjectManageBean"
|
||||||
select bmp.ID as id,bmp.`NAME` as name,bmp.COMPANY_ID as companyId,
|
parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
bmc.`NAME` as companyName,bmp.TYPE_ID as typeId,bpt.`NAME` as typeName,
|
select bmp.ID as id,bmp.`NAME` as name,bmp.COMPANY_ID as companyId,
|
||||||
bmp.VOL_ID as volId,bvl.`NAME` as volName,
|
bmc.`NAME` as companyName,bmp.TYPE_ID as typeId,bpt.`NAME` as typeName,
|
||||||
bmp.NUM as num,bmp.MANAGER as manager,bmp.NATURE as nature,
|
bmp.VOL_ID as volId,bvl.`NAME` as volName,
|
||||||
bmp.TELPHONE as telphone,bmp.PHONE as phone,bmp.FAX as fax,
|
bmp.NUM as num,bmp.MANAGER as manager,bmp.NATURE as nature,
|
||||||
bmp.ADDRESS as address,bmp.REMARKS as remarks,
|
bmp.TELPHONE as telphone,bmp.PHONE as phone,bmp.FAX as fax,
|
||||||
bmp.MATERIAL_CLERK as materialClerk,bmp.CLERK_PHONE as clerkPhone,
|
bmp.ADDRESS as address,bmp.REMARKS as remarks,
|
||||||
bmp.IS_BALANCE_END as isBalanceEnd,
|
bmp.MATERIAL_CLERK as materialClerk,bmp.CLERK_PHONE as clerkPhone,
|
||||||
bmp.KILOMETER as kilometer, bmp.provinceid, bmp.cityid , bmp.areaid, bmp.detailed
|
bmp.IS_BALANCE_END as isBalanceEnd,
|
||||||
from bm_project bmp
|
bmp.KILOMETER as kilometer, bmp.provinceid, bmp.cityid , bmp.areaid, bmp.detailed
|
||||||
LEFT JOIN bm_vol_level bvl on bvl.ID = bmp.VOL_ID
|
from bm_project bmp
|
||||||
LEFT JOIN bm_project_type bpt on bmp.TYPE_ID = bpt.ID
|
LEFT JOIN bm_vol_level bvl on bvl.ID = bmp.VOL_ID
|
||||||
LEFT JOIN bm_company bmc on bmc.ID = bmp.COMPANY_ID
|
LEFT JOIN bm_project_type bpt on bmp.TYPE_ID = bpt.ID
|
||||||
where bmp.ID=#{id}
|
LEFT JOIN bm_company bmc on bmc.ID = bmp.COMPANY_ID
|
||||||
<!-- <if test="name !=null">
|
where bmp.ID=#{id}
|
||||||
bmp.ID=#{id}
|
<!-- <if test="name !=null">
|
||||||
</if>
|
bmp.ID=#{id}
|
||||||
<if test="name !=null and name !='' ">
|
</if>
|
||||||
and bmp.NAME=#{name}
|
<if test="name !=null and name !='' ">
|
||||||
</if> -->
|
and bmp.NAME=#{name}
|
||||||
|
</if> -->
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="update" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<update id="update" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
|
|
@ -271,10 +277,10 @@
|
||||||
<if test="name !=null">
|
<if test="name !=null">
|
||||||
NAME=#{name},
|
NAME=#{name},
|
||||||
</if>
|
</if>
|
||||||
<if test="num !=null">
|
<if test="num !=null">
|
||||||
NUM=#{num},
|
NUM=#{num},
|
||||||
</if>
|
</if>
|
||||||
<if test="companyId1 !=null">
|
<if test="companyId1 !=null">
|
||||||
COMPANY_ID =#{companyId1},
|
COMPANY_ID =#{companyId1},
|
||||||
</if>
|
</if>
|
||||||
<if test="typeId1 !=null">
|
<if test="typeId1 !=null">
|
||||||
|
|
@ -311,7 +317,7 @@
|
||||||
<if test="address !=null">
|
<if test="address !=null">
|
||||||
ADDRESS=#{address},
|
ADDRESS=#{address},
|
||||||
</if>
|
</if>
|
||||||
<if test="volId1 !=null">
|
<if test="volId1 !=null">
|
||||||
VOL_ID = #{volId1},
|
VOL_ID = #{volId1},
|
||||||
</if>
|
</if>
|
||||||
<if test="remarks !=null">
|
<if test="remarks !=null">
|
||||||
|
|
@ -321,7 +327,7 @@
|
||||||
MATERIAL_CLERK=#{materialClerk},
|
MATERIAL_CLERK=#{materialClerk},
|
||||||
</if>
|
</if>
|
||||||
<if test="kilometer != null">
|
<if test="kilometer != null">
|
||||||
KILOMETER=#{kilometer},
|
KILOMETER=#{kilometer},
|
||||||
</if>
|
</if>
|
||||||
<if test="clerkPhone !=null">
|
<if test="clerkPhone !=null">
|
||||||
CLERK_PHONE=#{clerkPhone},
|
CLERK_PHONE=#{clerkPhone},
|
||||||
|
|
@ -331,36 +337,65 @@
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<update id="delete">
|
<update id="delete">
|
||||||
update bm_project set IS_ACTIVE =0
|
update bm_project
|
||||||
where ID =#{id}
|
set IS_ACTIVE =0
|
||||||
|
where ID = #{id}
|
||||||
|
</update>
|
||||||
|
<select id="findByCode" resultType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
|
SELECT ID, `NAME`
|
||||||
|
FROM bm_project
|
||||||
|
WHERE `NUM` = #{projectCode}
|
||||||
|
</select>
|
||||||
|
<update id="updateProject">
|
||||||
|
UPDATE bm_project
|
||||||
|
set NUM = #{num}
|
||||||
|
where ID = #{id}
|
||||||
|
</update>
|
||||||
|
<update id="updateProjectName">
|
||||||
|
UPDATE bm_project
|
||||||
|
set NAME = #{projectName}
|
||||||
|
where NUM = #{projectCode}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<select id="getProjectName" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="getProjectName" resultType="com.bonus.bm.beans.ProjectManageBean"
|
||||||
SELECT ID,`NAME`
|
parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
FROM bm_project
|
SELECT ID,`NAME`
|
||||||
WHERE COMPANY_ID = #{companyId}
|
FROM bm_project
|
||||||
<if test="typeId != null and typeId != ''">
|
WHERE COMPANY_ID = #{companyId}
|
||||||
AND TYPE_ID = #{typeId}
|
<if test="typeId != null and typeId != ''">
|
||||||
</if>
|
AND TYPE_ID = #{typeId}
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findByName" resultType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="findByName" resultType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
SELECT ID,`NAME`
|
SELECT ID, `NAME`
|
||||||
FROM bm_project
|
FROM bm_project
|
||||||
WHERE `NAME` = #{name}
|
WHERE `NAME` = #{name}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
<select id="getProvinces" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="getProvinces" resultType="com.bonus.bm.beans.ProjectManageBean"
|
||||||
SELECT provinceid as id, province as name FROM provinces ORDER BY id
|
parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
|
SELECT provinceid as id, province as name
|
||||||
|
FROM provinces
|
||||||
|
ORDER BY id
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getCities" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="getCities" resultType="com.bonus.bm.beans.ProjectManageBean"
|
||||||
SELECT cityid as id, city as name FROM cities WHERE provinceid = #{param.provinceid} ORDER BY id
|
parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
|
SELECT cityid as id, city as name
|
||||||
|
FROM cities
|
||||||
|
WHERE provinceid = #{param.provinceid}
|
||||||
|
ORDER BY id
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getDistricts" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
|
<select id="getDistricts" resultType="com.bonus.bm.beans.ProjectManageBean"
|
||||||
SELECT areaid as id, area as name FROM areas WHERE cityid = #{param.cityid} ORDER BY id
|
parameterType="com.bonus.bm.beans.ProjectManageBean">
|
||||||
|
SELECT areaid as id, area as name
|
||||||
|
FROM areas
|
||||||
|
WHERE cityid = #{param.cityid}
|
||||||
|
ORDER BY id
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
@ -33,371 +33,363 @@ import com.bonus.sys.beans.ZNode;
|
||||||
@RequestMapping("/backstage/project/")
|
@RequestMapping("/backstage/project/")
|
||||||
public class ProjectManageController extends BaseController<ProjectManageBean> {
|
public class ProjectManageController extends BaseController<ProjectManageBean> {
|
||||||
|
|
||||||
// 16位KEY
|
// 16位KEY
|
||||||
private static final String aesKey = "Z3PX8V9KJ2T7W4QN";
|
private static final String aesKey = "Z3PX8V9KJ2T7W4QN";
|
||||||
// 密钥
|
// 密钥
|
||||||
private static final String appSecret = "secret20250705";
|
private static final String appSecret = "secret20250705";
|
||||||
// appID
|
// appID
|
||||||
private static final String allowAppId = "equipment";
|
private static final String allowAppId = "equipment";
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectManageService pmService;
|
private ProjectManageService pmService;
|
||||||
|
|
||||||
@RequestMapping("list")
|
@RequestMapping("list")
|
||||||
public String index(Model model) {
|
public String index(Model model) {
|
||||||
return "/bm/projectManage";
|
return "/bm/projectManage";
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("projectTree")
|
@RequestMapping("projectTree")
|
||||||
public String unitTree(Model model) {
|
public String unitTree(Model model) {
|
||||||
return "/bm/projectTree";
|
return "/bm/projectTree";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 与数创部同步工程信息,单次接收1条
|
* 与数创部同步工程信息,单次接收1条
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "syncProject", method = RequestMethod.POST)
|
@RequestMapping(value = "syncProject", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes syncProject(@RequestBody JSONObject payload) {
|
public AjaxRes syncProject(@RequestBody JSONObject payload) {
|
||||||
AjaxRes result = getAjaxRes();
|
AjaxRes result = getAjaxRes();
|
||||||
if (payload == null) {
|
if (payload == null) {
|
||||||
result.setFailMsg("同步错误,参数不能为空!");
|
result.setFailMsg("同步错误,参数不能为空!");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
String appId = payload.getStr("appId");
|
String appId = payload.getStr("appId");
|
||||||
String timestamp = payload.getStr("timestamp");
|
String timestamp = payload.getStr("timestamp");
|
||||||
String encryptedData = payload.getStr("data");
|
String encryptedData = payload.getStr("data");
|
||||||
String sign = payload.getStr("sign");
|
String sign = payload.getStr("sign");
|
||||||
|
|
||||||
// 1. 校验appId
|
// 1. 校验appId
|
||||||
if (Objects.isNull(appId) || !allowAppId.equals(appId)) {
|
if (Objects.isNull(appId) || !allowAppId.equals(appId)) {
|
||||||
result.setFailMsg("appId不匹配");
|
result.setFailMsg("appId不匹配");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. 时间戳校验(防重放)
|
// 3. 验证签名
|
||||||
// try {
|
String baseSign = appId + timestamp + encryptedData + appSecret;
|
||||||
// Date time = DateUtil.parse(timestamp, "yyyyMMddHHmmss");
|
String serverSign = SecureUtil.sha256(baseSign).toUpperCase();
|
||||||
// long diff = Math.abs(System.currentTimeMillis() - time.getTime());
|
if (!serverSign.equals(sign)) {
|
||||||
// if (diff > 5 * 60 * 1000) {
|
result.setFailMsg("签名不合法!");
|
||||||
// result.setFailMsg("请求时间戳不合法!!");
|
return result;
|
||||||
// return result;
|
}
|
||||||
// }
|
|
||||||
// } catch (Exception e) {
|
|
||||||
// System.err.println("时间戳解析异常:" + timestamp + "," + e.getMessage());
|
|
||||||
// result.setFailMsg("时间戳解析异常");
|
|
||||||
// return result;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// 3. 验证签名
|
// 4. 解密数据
|
||||||
String baseSign = appId + timestamp + encryptedData + appSecret;
|
AES aes = SecureUtil.aes(aesKey.getBytes());
|
||||||
String serverSign = SecureUtil.sha256(baseSign).toUpperCase();
|
String json = aes.decryptStr(encryptedData);
|
||||||
if (!serverSign.equals(sign)) {
|
JSONObject bizData = JSONUtil.parseObj(json);
|
||||||
result.setFailMsg("签名不合法!");
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 4. 解密数据
|
// 5. 业务处理
|
||||||
AES aes = SecureUtil.aes(aesKey.getBytes());
|
String projectCode = bizData.getStr("projectCode");
|
||||||
String json = aes.decryptStr(encryptedData);
|
String projectName = bizData.getStr("projectName");
|
||||||
JSONObject bizData = JSONUtil.parseObj(json);
|
String companyCode = bizData.getStr("companyCode");
|
||||||
|
String typeCode = bizData.getStr("typeCode");
|
||||||
|
String startDate = bizData.getStr("startDate", "");
|
||||||
|
String status = bizData.getStr("status");
|
||||||
|
|
||||||
// 5. 业务处理
|
// 6. 校验数据
|
||||||
String projectCode = bizData.getStr("projectCode");
|
if (StrUtil.isBlank(projectCode) || StrUtil.isBlank(projectName) || StrUtil.isBlank(companyCode)
|
||||||
String projectName = bizData.getStr("projectName");
|
|| StrUtil.isBlank(typeCode) || StrUtil.isBlank(status)) {
|
||||||
String companyCode = bizData.getStr("companyCode");
|
System.err.println(projectCode + "," + projectName + "," + companyCode + "," + typeCode + "," + status + ","
|
||||||
String typeCode = bizData.getStr("typeCode");
|
+ startDate);
|
||||||
String startDate = bizData.getStr("startDate", "");
|
result.setFailMsg("数据不完整!!");
|
||||||
String status = bizData.getStr("status");
|
return result;
|
||||||
|
} else {
|
||||||
|
ProjectManageBean beanCode = pmService.findByCode(projectCode);
|
||||||
|
if (beanCode == null) {
|
||||||
|
ProjectManageBean findBean = pmService.findByName(projectName);
|
||||||
|
if (findBean != null) {
|
||||||
|
pmService.updateProject(projectCode, String.valueOf(findBean.getId()));
|
||||||
|
result.setFailMsg("工程名称已存在,跳过处理!");
|
||||||
|
} else {
|
||||||
|
ProjectManageBean bean = new ProjectManageBean();
|
||||||
|
bean.setName(projectName);
|
||||||
|
bean.setNum(projectCode);
|
||||||
|
bean.setCompanyId(companyCode);
|
||||||
|
bean.setTypeId(typeCode);
|
||||||
|
bean.setStartTime(startDate);
|
||||||
|
bean.setEndTime("");
|
||||||
|
try {
|
||||||
|
pmService.insert(bean);
|
||||||
|
System.out.println("同步工程数据成功: " + json);
|
||||||
|
result.setSucceedMsg("同步成功");
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.err.println(e.getMessage());
|
||||||
|
result.setFailMsg(projectName + "----工程信息同步失败:" + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
pmService.updateProjectName(projectName, projectCode);
|
||||||
|
}
|
||||||
|
|
||||||
// 6. 校验数据
|
}
|
||||||
if (StrUtil.isBlank(projectCode) || StrUtil.isBlank(projectName) || StrUtil.isBlank(companyCode)
|
return result;
|
||||||
|| StrUtil.isBlank(typeCode) || StrUtil.isBlank(status)) {
|
}
|
||||||
System.err.println(projectCode + "," + projectName + "," + companyCode + "," + typeCode + "," + status + ","
|
|
||||||
+ startDate);
|
|
||||||
result.setFailMsg("数据不完整!!");
|
|
||||||
return result;
|
|
||||||
} else {
|
|
||||||
ProjectManageBean findBean = pmService.findByName(projectName);
|
|
||||||
if (findBean != null) {
|
|
||||||
System.out.println("工程名称已存在,跳过处理!");
|
|
||||||
result.setFailMsg("工程名称已存在,跳过处理!");
|
|
||||||
} else {
|
|
||||||
ProjectManageBean bean = new ProjectManageBean();
|
|
||||||
bean.setName(projectName);
|
|
||||||
bean.setNum(projectCode);
|
|
||||||
bean.setCompanyId(companyCode);
|
|
||||||
bean.setTypeId(typeCode);
|
|
||||||
bean.setStartTime(startDate);
|
|
||||||
bean.setEndTime("");
|
|
||||||
try {
|
|
||||||
pmService.insert(bean);
|
|
||||||
System.out.println("同步工程数据成功: " + json);
|
|
||||||
result.setSucceedMsg("同步成功");
|
|
||||||
} catch (Exception e) {
|
|
||||||
System.err.println(e.getMessage());
|
|
||||||
result.setFailMsg(projectName + "----工程信息同步失败:" + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping(value = "findByPage", method = RequestMethod.POST)
|
@RequestMapping(value = "findByPage", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes findByPage(Page<ProjectManageBean> page, ProjectManageBean o) {
|
public AjaxRes findByPage(Page<ProjectManageBean> page, ProjectManageBean o) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
if (ar.setNoAuth(doSecurityIntercept(GlobalConst.RESOURCES_TYPE_MENU, "/backstage/project/list"))) {
|
if (ar.setNoAuth(doSecurityIntercept(GlobalConst.RESOURCES_TYPE_MENU, "/backstage/project/list"))) {
|
||||||
try {
|
try {
|
||||||
if (o != null && !"".equals(o.getEndTime())) {
|
if (o != null && !"".equals(o.getEndTime())) {
|
||||||
String time = DateTimeHelper.getAddNumDay(o.getEndTime(), 1);
|
String time = DateTimeHelper.getAddNumDay(o.getEndTime(), 1);
|
||||||
o.setEndTime(time);
|
o.setEndTime(time);
|
||||||
}
|
}
|
||||||
Page<ProjectManageBean> station = pmService.findByPage(o, page);
|
Page<ProjectManageBean> station = pmService.findByPage(o, page);
|
||||||
Map<String, Object> p = new HashMap<String, Object>();
|
Map<String, Object> p = new HashMap<String, Object>();
|
||||||
p.put("list", station);
|
p.put("list", station);
|
||||||
ar.setSucceed(p);
|
ar.setSucceed(p);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "insert", method = RequestMethod.POST)
|
@RequestMapping(value = "insert", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes insert(ProjectManageBean o) {
|
public AjaxRes insert(ProjectManageBean o) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
ProjectManageBean bean = pmService.findByName(o.getName());
|
ProjectManageBean bean = pmService.findByName(o.getName());
|
||||||
if (bean == null) {
|
if (bean == null) {
|
||||||
String typeId = o.getTypeId1();
|
String typeId = o.getTypeId1();
|
||||||
String companyId = o.getCompanyId1();
|
String companyId = o.getCompanyId1();
|
||||||
|
|
||||||
String provinceid = o.getProvinceid();
|
String provinceid = o.getProvinceid();
|
||||||
String cityid = o.getCityid();
|
String cityid = o.getCityid();
|
||||||
String areaid = o.getAreaid();
|
String areaid = o.getAreaid();
|
||||||
if ("0".equals(typeId) || "0".equals(companyId)) {
|
if ("0".equals(typeId) || "0".equals(companyId)) {
|
||||||
ar.setFailMsg("请选择所属分公司或者工程类别");
|
ar.setFailMsg("请选择所属分公司或者工程类别");
|
||||||
} else if ("0".equals(provinceid)) {
|
} else if ("0".equals(provinceid)) {
|
||||||
ar.setFailMsg("请选择所在省");
|
ar.setFailMsg("请选择所在省");
|
||||||
} else if ("0".equals(cityid)) {
|
} else if ("0".equals(cityid)) {
|
||||||
ar.setFailMsg("请选择所在市");
|
ar.setFailMsg("请选择所在市");
|
||||||
} else if ("0".equals(areaid)) {
|
} else if ("0".equals(areaid)) {
|
||||||
ar.setFailMsg("请选择所在区");
|
ar.setFailMsg("请选择所在区");
|
||||||
} else {
|
} else {
|
||||||
pmService.insert(o);
|
pmService.insert(o);
|
||||||
ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED);
|
ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ar.setFailMsg("工程名称重复,请重新填写");
|
ar.setFailMsg("工程名称重复,请重新填写");
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.SAVE_FAIL);
|
ar.setFailMsg(GlobalConst.SAVE_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "update", method = RequestMethod.POST)
|
@RequestMapping(value = "update", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes update(ProjectManageBean o) {
|
public AjaxRes update(ProjectManageBean o) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
|
|
||||||
String typeId = o.getTypeId1();
|
String typeId = o.getTypeId1();
|
||||||
String companyId = o.getCompanyId1();
|
String companyId = o.getCompanyId1();
|
||||||
|
|
||||||
String provinceid = o.getProvinceid();
|
String provinceid = o.getProvinceid();
|
||||||
String cityid = o.getCityid();
|
String cityid = o.getCityid();
|
||||||
String areaid = o.getAreaid();
|
String areaid = o.getAreaid();
|
||||||
if ("0".equals(typeId) || "0".equals(companyId)) {
|
if ("0".equals(typeId) || "0".equals(companyId)) {
|
||||||
ar.setFailMsg("请选择所属分公司或者工程类别");
|
ar.setFailMsg("请选择所属分公司或者工程类别");
|
||||||
} else if ("0".equals(provinceid)) {
|
} else if ("0".equals(provinceid)) {
|
||||||
ar.setFailMsg("请选择所在省");
|
ar.setFailMsg("请选择所在省");
|
||||||
} else if ("0".equals(cityid)) {
|
} else if ("0".equals(cityid)) {
|
||||||
ar.setFailMsg("请选择所在市");
|
ar.setFailMsg("请选择所在市");
|
||||||
} else if ("0".equals(areaid)) {
|
} else if ("0".equals(areaid)) {
|
||||||
ar.setFailMsg("请选择所在区");
|
ar.setFailMsg("请选择所在区");
|
||||||
} else {
|
} else {
|
||||||
pmService.update(o);
|
pmService.update(o);
|
||||||
ar.setSucceedMsg(GlobalConst.UPDATE_SUCCEED);
|
ar.setSucceedMsg(GlobalConst.UPDATE_SUCCEED);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.UPDATE_FAIL);
|
ar.setFailMsg(GlobalConst.UPDATE_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "find", method = RequestMethod.POST)
|
@RequestMapping(value = "find", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes find(ProjectManageBean o) {
|
public AjaxRes find(ProjectManageBean o) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ProjectManageBean> list = pmService.find(o);
|
List<ProjectManageBean> list = pmService.find(o);
|
||||||
ar.setSucceed(list);
|
ar.setSucceed(list);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "getProjectType", method = RequestMethod.POST)
|
@RequestMapping(value = "getProjectType", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes getProjectType() {
|
public AjaxRes getProjectType() {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ProjectManageBean> list = pmService.getProjectType();
|
List<ProjectManageBean> list = pmService.getProjectType();
|
||||||
Map<String, Object> p = new HashMap<String, Object>();
|
Map<String, Object> p = new HashMap<String, Object>();
|
||||||
p.put("list", list);
|
p.put("list", list);
|
||||||
ar.setSucceed(p);
|
ar.setSucceed(p);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "getProjectName", method = RequestMethod.POST)
|
@RequestMapping(value = "getProjectName", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes getProjectName(ProjectManageBean o) {
|
public AjaxRes getProjectName(ProjectManageBean o) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ProjectManageBean> list = pmService.getProjectName(o);
|
List<ProjectManageBean> list = pmService.getProjectName(o);
|
||||||
Map<String, Object> p = new HashMap<String, Object>();
|
Map<String, Object> p = new HashMap<String, Object>();
|
||||||
p.put("list", list);
|
p.put("list", list);
|
||||||
ar.setSucceed(p);
|
ar.setSucceed(p);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "getVolLever", method = RequestMethod.POST)
|
@RequestMapping(value = "getVolLever", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes getVolLever() {
|
public AjaxRes getVolLever() {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ProjectManageBean> list = pmService.getVolLever();
|
List<ProjectManageBean> list = pmService.getVolLever();
|
||||||
Map<String, Object> p = new HashMap<String, Object>();
|
Map<String, Object> p = new HashMap<String, Object>();
|
||||||
p.put("list", list);
|
p.put("list", list);
|
||||||
ar.setSucceed(p);
|
ar.setSucceed(p);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "findWorkTree", method = RequestMethod.POST)
|
@RequestMapping(value = "findWorkTree", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes roleTree() {
|
public AjaxRes roleTree() {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ZNode> list = pmService.findWorkTree();
|
List<ZNode> list = pmService.findWorkTree();
|
||||||
ar.setSucceed(list);
|
ar.setSucceed(list);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "projectTree", method = RequestMethod.POST)
|
@RequestMapping(value = "projectTree", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes projectTree(ProjectManageBean o, HttpServletRequest req) {
|
public AjaxRes projectTree(ProjectManageBean o, HttpServletRequest req) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ZNode> list = null;
|
List<ZNode> list = null;
|
||||||
if ("0".equals(o.getUnitId())) {
|
if ("0".equals(o.getUnitId())) {
|
||||||
list = pmService.projectTree(o);
|
list = pmService.projectTree(o);
|
||||||
} else {
|
} else {
|
||||||
if (StringHelper.isNotEmpty(o.getUnitId())) {
|
if (StringHelper.isNotEmpty(o.getUnitId())) {
|
||||||
list = pmService.projectTreeByUnitId(o);
|
list = pmService.projectTreeByUnitId(o);
|
||||||
} else {
|
} else {
|
||||||
list = pmService.projectTree(o);
|
list = pmService.projectTree(o);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String isOpen = req.getParameter("isOpen");
|
String isOpen = req.getParameter("isOpen");
|
||||||
if (StringHelper.isNotEmpty(isOpen)) {
|
if (StringHelper.isNotEmpty(isOpen)) {
|
||||||
for (ZNode zNode : list) {
|
for (ZNode zNode : list) {
|
||||||
zNode.setOpen(true);
|
zNode.setOpen(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Map<String, Object> p = new HashMap<String, Object>();
|
Map<String, Object> p = new HashMap<String, Object>();
|
||||||
p.put("list", list);
|
p.put("list", list);
|
||||||
ar.setSucceed(p);
|
ar.setSucceed(p);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "del", method = RequestMethod.POST)
|
@RequestMapping(value = "del", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes del(ProjectManageBean o) {
|
public AjaxRes del(ProjectManageBean o) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
pmService.delete(o);
|
pmService.delete(o);
|
||||||
ar.setSucceedMsg(GlobalConst.DEL_SUCCEED);
|
ar.setSucceedMsg(GlobalConst.DEL_SUCCEED);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DEL_FAIL);
|
ar.setFailMsg(GlobalConst.DEL_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "getProvinces", method = RequestMethod.POST)
|
@RequestMapping(value = "getProvinces", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes getProvinces() {
|
public AjaxRes getProvinces() {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ProjectManageBean> list = pmService.getProvinces();
|
List<ProjectManageBean> list = pmService.getProvinces();
|
||||||
Map<String, Object> p = new HashMap<String, Object>();
|
Map<String, Object> p = new HashMap<String, Object>();
|
||||||
p.put("list", list);
|
p.put("list", list);
|
||||||
ar.setSucceed(p);
|
ar.setSucceed(p);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "getCities", method = RequestMethod.POST)
|
@RequestMapping(value = "getCities", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes getCities(ProjectManageBean o) {
|
public AjaxRes getCities(ProjectManageBean o) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ProjectManageBean> list = pmService.getCities(o);
|
List<ProjectManageBean> list = pmService.getCities(o);
|
||||||
Map<String, Object> p = new HashMap<String, Object>();
|
Map<String, Object> p = new HashMap<String, Object>();
|
||||||
p.put("list", list);
|
p.put("list", list);
|
||||||
ar.setSucceed(p);
|
ar.setSucceed(p);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "getDistricts", method = RequestMethod.POST)
|
@RequestMapping(value = "getDistricts", method = RequestMethod.POST)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxRes getDistricts(ProjectManageBean o) {
|
public AjaxRes getDistricts(ProjectManageBean o) {
|
||||||
AjaxRes ar = getAjaxRes();
|
AjaxRes ar = getAjaxRes();
|
||||||
try {
|
try {
|
||||||
List<ProjectManageBean> list = pmService.getDistricts(o);
|
List<ProjectManageBean> list = pmService.getDistricts(o);
|
||||||
Map<String, Object> p = new HashMap<String, Object>();
|
Map<String, Object> p = new HashMap<String, Object>();
|
||||||
p.put("list", list);
|
p.put("list", list);
|
||||||
ar.setSucceed(p);
|
ar.setSucceed(p);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
ar.setFailMsg(GlobalConst.DATA_FAIL);
|
||||||
}
|
}
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,24 +12,31 @@ import com.bonus.sys.beans.ZNode;
|
||||||
@BonusBatis
|
@BonusBatis
|
||||||
public interface ProjectManageDao extends BaseDao<ProjectManageBean> {
|
public interface ProjectManageDao extends BaseDao<ProjectManageBean> {
|
||||||
|
|
||||||
List<ProjectManageBean> getVolLever();
|
List<ProjectManageBean> getVolLever();
|
||||||
|
|
||||||
List<ProjectManageBean> getProjectType();
|
List<ProjectManageBean> getProjectType();
|
||||||
|
|
||||||
public List<ZNode> findWorkTree();
|
public List<ZNode> findWorkTree();
|
||||||
|
|
||||||
List<ProjectManageBean> getProjectName(ProjectManageBean o);
|
List<ProjectManageBean> getProjectName(ProjectManageBean o);
|
||||||
|
|
||||||
List<ZNode> projectTree(ProjectManageBean o);
|
List<ZNode> projectTree(ProjectManageBean o);
|
||||||
|
|
||||||
List<ZNode> projectTreeByUnitId(ProjectManageBean o);
|
List<ZNode> projectTreeByUnitId(ProjectManageBean o);
|
||||||
|
|
||||||
ProjectManageBean findByName(String name);
|
ProjectManageBean findByName(String name);
|
||||||
|
|
||||||
List<ProjectManageBean> getProvinces();
|
|
||||||
|
|
||||||
List<ProjectManageBean> getCities(@Param("param") ProjectManageBean o);
|
|
||||||
|
|
||||||
List<ProjectManageBean> getDistricts(@Param("param") ProjectManageBean o);
|
List<ProjectManageBean> getProvinces();
|
||||||
|
|
||||||
|
List<ProjectManageBean> getCities(@Param("param") ProjectManageBean o);
|
||||||
|
|
||||||
|
List<ProjectManageBean> getDistricts(@Param("param") ProjectManageBean o);
|
||||||
|
|
||||||
|
void updateProject(@Param("num") String num, @Param("id") String id);
|
||||||
|
|
||||||
|
ProjectManageBean findByCode(String projectCode);
|
||||||
|
|
||||||
|
void updateProjectName(@Param("projectName")String projectName, @Param("projectCode")String projectCode);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,14 @@ public interface ProjectManageService extends BaseService<ProjectManageBean> {
|
||||||
List<ZNode> projectTreeByUnitId(ProjectManageBean o);
|
List<ZNode> projectTreeByUnitId(ProjectManageBean o);
|
||||||
|
|
||||||
ProjectManageBean findByName(String name);
|
ProjectManageBean findByName(String name);
|
||||||
|
void updateProject(String num,String id);
|
||||||
List<ProjectManageBean> getProvinces();
|
List<ProjectManageBean> getProvinces();
|
||||||
|
|
||||||
List<ProjectManageBean> getCities(ProjectManageBean o);
|
List<ProjectManageBean> getCities(ProjectManageBean o);
|
||||||
|
|
||||||
List<ProjectManageBean> getDistricts(ProjectManageBean o);
|
List<ProjectManageBean> getDistricts(ProjectManageBean o);
|
||||||
|
|
||||||
|
ProjectManageBean findByCode(String projectCode);
|
||||||
|
|
||||||
|
void updateProjectName(String projectName, String projectCode);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,57 +13,72 @@ import com.bonus.sys.beans.ZNode;
|
||||||
@Service("ProjectManageService")
|
@Service("ProjectManageService")
|
||||||
public class ProjectManageServiceImp extends BaseServiceImp<ProjectManageBean> implements ProjectManageService {
|
public class ProjectManageServiceImp extends BaseServiceImp<ProjectManageBean> implements ProjectManageService {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectManageDao pmDao;
|
private ProjectManageDao pmDao;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProjectManageBean> getVolLever() {
|
public List<ProjectManageBean> getVolLever() {
|
||||||
return pmDao.getVolLever();
|
return pmDao.getVolLever();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProjectManageBean> getProjectType() {
|
public List<ProjectManageBean> getProjectType() {
|
||||||
return pmDao.getProjectType();
|
return pmDao.getProjectType();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ZNode> findWorkTree() {
|
public List<ZNode> findWorkTree() {
|
||||||
return pmDao.findWorkTree();
|
return pmDao.findWorkTree();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProjectManageBean> getProjectName(ProjectManageBean o) {
|
public List<ProjectManageBean> getProjectName(ProjectManageBean o) {
|
||||||
return pmDao.getProjectName(o);
|
return pmDao.getProjectName(o);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ZNode> projectTree(ProjectManageBean o) {
|
public List<ZNode> projectTree(ProjectManageBean o) {
|
||||||
return pmDao.projectTree(o);
|
return pmDao.projectTree(o);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ZNode> projectTreeByUnitId(ProjectManageBean o) {
|
public List<ZNode> projectTreeByUnitId(ProjectManageBean o) {
|
||||||
return pmDao.projectTreeByUnitId(o);
|
return pmDao.projectTreeByUnitId(o);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ProjectManageBean findByName(String name) {
|
public ProjectManageBean findByName(String name) {
|
||||||
return pmDao.findByName(name);
|
return pmDao.findByName(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProjectManageBean> getProvinces() {
|
public void updateProject(String num, String id) {
|
||||||
return pmDao.getProvinces();
|
pmDao.updateProject(num, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProjectManageBean> getCities(ProjectManageBean o) {
|
public List<ProjectManageBean> getProvinces() {
|
||||||
return pmDao.getCities(o);
|
return pmDao.getProvinces();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProjectManageBean> getDistricts(ProjectManageBean o) {
|
public List<ProjectManageBean> getCities(ProjectManageBean o) {
|
||||||
return pmDao.getDistricts(o);
|
return pmDao.getCities(o);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ProjectManageBean> getDistricts(ProjectManageBean o) {
|
||||||
|
return pmDao.getDistricts(o);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ProjectManageBean findByCode(String projectCode) {
|
||||||
|
return pmDao.findByCode(projectCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateProjectName(String projectName, String projectCode) {
|
||||||
|
pmDao.updateProjectName(projectName, projectCode);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue