ly
/
ypc_manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ly:757f840d1dea8837d26e58cdc290183ac5f89d88
Branches Tags
ly:master
..
compare: ly:c6d45bc5271a3b8a488683d03df6bf7d77bdb9bb
Branches Tags
ly:master

No commits in common. "757f840d1dea8837d26e58cdc290183ac5f89d88" and "c6d45bc5271a3b8a488683d03df6bf7d77bdb9bb" have entirely different histories.
757f840d1d ... c6d45bc527

16 changed files with 56 additions and 312 deletions
Show Stats Expand all files Collapse all files

43
basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java
View File

@ -14,18 +14,11 @@ public interface TbChryxxbMapper
{ {
/** /**
* 查询检查站查获人员信息 * 查询检查站查获人员信息
* *
* @param id 检查站查获人员信息ID * @param HCRYBH 检查站查获人员信息ID
* @return 检查站查获人员信息 * @return 检查站查获人员信息
*/ */
public TbChryxxb selectTbChryxxbById(Integer id); public TbChryxxb selectTbChryxxbById(String HCRYBH);
/**
* 查询检查站查获人员信息
*
* @param HCRYBH 检查站查获人员信息编号
* @return 检查站查获人员信息
*/
public TbChryxxb selectTbChryxxbByHcrybh(String HCRYBH);
/** /**
* 查询检查站查获人员信息列表 * 查询检查站查获人员信息列表
@ -57,7 +50,7 @@ public interface TbChryxxbMapper
* @param HCRYBH 检查站查获人员信息ID * @param HCRYBH 检查站查获人员信息ID
* @return 结果 * @return 结果
*/ */
public int deleteTbChryxxbByHcrybh(String HCRYBH); public int deleteTbChryxxbById(String HCRYBH);
/** /**
* 批量删除检查站查获人员信息 * 批量删除检查站查获人员信息
@ -65,31 +58,5 @@ public interface TbChryxxbMapper
* @param HCRYBHs 需要删除的数据ID * @param HCRYBHs 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
public int deleteTbChryxxbByHcrybhs(String[] HCRYBHs); public int deleteTbChryxxbByIds(String[] HCRYBHs);
/**
* 删除检查站查获人员信息
*
* @param id 检查站查获人员信息ID
* @return 结果
*/
public int deleteTbChryxxbById(Integer id);
/**
* 批量删除检查站查获人员信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteTbChryxxbByIds(Integer[] ids);
/**
* 从人车物核查表及卡点表获取查货人员信息
*
* @param date 盘查日期
* @return 检查站查获人员信息集合
*/
public List<TbChryxxb> selectTbChryxxbListFromTbCheckPerson(String date);
} }

47
basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml
View File

@ -5,7 +5,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="basepro.manager.mapper.TbChryxxbMapper"> <mapper namespace="basepro.manager.mapper.TbChryxxbMapper">
<resultMap type="basepro.manager.pojo.TbChryxxb" id="TbChryxxbResult"> <resultMap type="basepro.manager.pojo.TbChryxxb" id="TbChryxxbResult">
<result property="id" column="id" />
<result property="HCRYBH" column="HCRYBH" /> <result property="HCRYBH" column="HCRYBH" />
<result property="XZQHDM" column="XZQHDM" /> <result property="XZQHDM" column="XZQHDM" />
<result property="XZQHMC" column="XZQHMC" /> <result property="XZQHMC" column="XZQHMC" />
@ -20,13 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTbChryxxbVo"> <sql id="selectTbChryxxbVo">
select id, HCRYBH, XZQHDM, XZQHMC, GAJGDM, GAJGMC, JCZDM, JCZMC, jcsj, DATE_FORMAT(jcsj, '%Y-%m-%d %H:%i:%s') AS jcsjStr, ZJHM, HCRYLB from tb_chryxxb select HCRYBH, XZQHDM, XZQHMC, GAJGDM, GAJGMC, JCZDM, JCZMC, jcsj, DATE_FORMAT(jcsj, '%Y-%m-%d') AS jcsjStr, ZJHM, HCRYLB from tb_chryxxb
</sql> </sql>
<select id="selectTbChryxxbList" parameterType="basepro.manager.pojo.TbChryxxb" resultMap="TbChryxxbResult"> <select id="selectTbChryxxbList" parameterType="basepro.manager.pojo.TbChryxxb" resultMap="TbChryxxbResult">
<include refid="selectTbChryxxbVo"/> <include refid="selectTbChryxxbVo"/>
<where> <where>
<if test="id != null and id != 0"> and id = #{id}</if>
<if test="XZQHDM != null and XZQHDM != ''"> and XZQHDM = #{XZQHDM}</if> <if test="XZQHDM != null and XZQHDM != ''"> and XZQHDM = #{XZQHDM}</if>
<if test="XZQHMC != null and XZQHMC != ''"> and XZQHMC like concat('%',#{XZQHMC},'%')</if> <if test="XZQHMC != null and XZQHMC != ''"> and XZQHMC like concat('%',#{XZQHMC},'%')</if>
<if test="GAJGDM != null and GAJGDM != ''"> and GAJGDM = #{GAJGDM}</if> <if test="GAJGDM != null and GAJGDM != ''"> and GAJGDM = #{GAJGDM}</if>
@ -44,31 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectTbChryxxbByHcrybh" parameterType="String" resultMap="TbChryxxbResult"> <select id="selectTbChryxxbById" parameterType="String" resultMap="TbChryxxbResult">
<include refid="selectTbChryxxbVo"/> <include refid="selectTbChryxxbVo"/>
where HCRYBH = #{HCRYBH} where HCRYBH = #{HCRYBH}
</select> </select>
<select id="selectTbChryxxbListFromTbCheckPerson" parameterType="String" resultMap="TbChryxxbResult">
SELECT HCRYBH, XZQHDM, GAJGDM, GAJGMC, JCZDM, JCZMC, JCSJ, ZJHM,HCRYLB FROM (
SELECT t.sfz as ZJHM,LEFT(s.dept_id,4) as XZQHDM,
(CASE WHEN t.people_status = '3' THEN '1'
WHEN t.people_status = '7' THEN '2'
ELSE '3'
END) as HCRYLB,t.check_time as JCSJ,t.police_id_card as HCRYBH,CONCAT('JCZ',LEFT(s.dept_id,6),(s.id+1000)) as JCZDM,
s.name as JCZMC,s.id,s.dept_id as GAJGDM,s.dept_name as GAJGMC FROM (
select p.sfz,p.people_status,p.check_time,p.police_id_card,p.point_x,p.point_y from `tb_check_person` p where p.point_x is not null and p.point_x != ''
and p.people_status != 0
and DATE_FORMAT(p.check_time, '%Y-%m-%d') = DATE_FORMAT(#{date}, '%Y-%m-%d')
) t inner join `tb_stuck` s on (s.point_x = t.point_x and s.point_y = t.point_y)
) n order by n.JCSJ asc;
</select>
<select id="selectTbChryxxbById" parameterType="Integer" resultMap="TbChryxxbResult">
<include refid="selectTbChryxxbVo"/>
where id = #{id}
</select>
<insert id="insertTbChryxxb" parameterType="basepro.manager.pojo.TbChryxxb" useGeneratedKeys="true" keyProperty="HCRYBH"> <insert id="insertTbChryxxb" parameterType="basepro.manager.pojo.TbChryxxb" useGeneratedKeys="true" keyProperty="HCRYBH">
insert into tb_chryxxb insert into tb_chryxxb
@ -101,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateTbChryxxb" parameterType="basepro.manager.pojo.TbChryxxb"> <update id="updateTbChryxxb" parameterType="basepro.manager.pojo.TbChryxxb">
update tb_chryxxb update tb_chryxxb
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="HCRYBH != null and HCRYBH != ''">HCRYBH = #{HCRYBH},</if>
<if test="XZQHDM != null and XZQHDM != ''">XZQHDM = #{XZQHDM},</if> <if test="XZQHDM != null and XZQHDM != ''">XZQHDM = #{XZQHDM},</if>
<if test="XZQHMC != null and XZQHMC != ''">XZQHMC = #{XZQHMC},</if> <if test="XZQHMC != null and XZQHMC != ''">XZQHMC = #{XZQHMC},</if>
<if test="GAJGDM != null and GAJGDM != ''">GAJGDM = #{GAJGDM},</if> <if test="GAJGDM != null and GAJGDM != ''">GAJGDM = #{GAJGDM},</if>
@ -112,27 +88,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ZJHM != null and ZJHM != ''">ZJHM = #{ZJHM},</if> <if test="ZJHM != null and ZJHM != ''">ZJHM = #{ZJHM},</if>
<if test="HCRYLB != null and HCRYLB != ''">HCRYLB = #{HCRYLB},</if> <if test="HCRYLB != null and HCRYLB != ''">HCRYLB = #{HCRYLB},</if>
</trim> </trim>
where id = #{id} where HCRYBH = #{HCRYBH}
</update> </update>
<delete id="deleteTbChryxxbByHcrybh" parameterType="String"> <delete id="deleteTbChryxxbById" parameterType="String">
delete from tb_chryxxb where HCRYBH = #{HCRYBH}
</delete>
<delete id="deleteTbChryxxbById" parameterType="Integer">
delete from tb_chryxxb where HCRYBH = #{HCRYBH} delete from tb_chryxxb where HCRYBH = #{HCRYBH}
</delete> </delete>
<delete id="deleteTbChryxxbByHcrybhs" parameterType="String"> <delete id="deleteTbChryxxbByIds" parameterType="String">
delete from tb_chryxxb where HCRYBH in delete from tb_chryxxb where HCRYBH in
<foreach item="HCRYBH" collection="array" open="(" separator="," close=")"> <foreach item="HCRYBH" collection="array" open="(" separator="," close=")">
#{HCRYBH} #{HCRYBH}
</foreach> </foreach>
</delete> </delete>
<delete id="deleteTbChryxxbByIds" parameterType="Integer">
delete from tb_chryxxb where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper> </mapper>

7
basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml
View File

@ -47,12 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="djsj != null "> and DJSJ = #{djsj}</if> <if test="djsj != null "> and DJSJ = #{djsj}</if>
<if test="zrdwdm != null and zrdwdm != ''"> and ZRDWDM = #{zrdwdm}</if> <if test="zrdwdm != null and zrdwdm != ''"> and ZRDWDM = #{zrdwdm}</if>
<if test="zrdwmc != null and zrdwmc != ''"> and ZRDWMC = #{zrdwmc}</if> <if test="zrdwmc != null and zrdwmc != ''"> and ZRDWMC = #{zrdwmc}</if>
<if test="params.beginTCSJ != null and params.beginTCSJ != ''"><!-- 开始时间检索 --> <if test="tcsj != null "> and TCSJ = #{tcsj}</if>
AND date_format(TCSJ,'%y%m%d') &gt;= date_format(#{params.beginTCSJ},'%y%m%d')
</if>
<if test="params.endTCSJ != null and params.endTCSJ != ''"><!-- 结束时间检索 -->
AND date_format(TCSJ,'%y%m%d') &lt;= date_format(#{params.endTCSJ},'%y%m%d')
</if>
<if test="tcgcjs != null and tcgcjs != ''"> and TCGCJS = #{tcgcjs}</if> <if test="tcgcjs != null and tcgcjs != ''"> and TCGCJS = #{tcgcjs}</if>
<if test="tcjg != null and tcjg != ''"> and TCJG = #{tcjg}</if> <if test="tcjg != null and tcjg != ''"> and TCJG = #{tcjg}</if>
<if test="jlgxsj != null "> and JLGXSJ = #{jlgxsj}</if> <if test="jlgxsj != null "> and JLGXSJ = #{jlgxsj}</if>

7
basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml
View File

@ -70,12 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (d.GAJGDM = #{GAJGDM} OR d.GAJGDM IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{GAJGDM},ancestors) )) and (d.GAJGDM = #{GAJGDM} OR d.GAJGDM IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{GAJGDM},ancestors) ))
</if> </if>
<if test="GAJGMC != null and GAJGMC != ''"> and GAJGMC = #{GAJGMC}</if> <if test="GAJGMC != null and GAJGMC != ''"> and GAJGMC = #{GAJGMC}</if>
<if test="params.beginZAFKRQ != null and params.beginZAFKRQ != ''"><!-- 开始时间检索 --> <if test="ZAFKRQ != null "> and ZAFKRQ = #{ZAFKRQ}</if>
AND date_format(d.ZAFKRQ,'%y%m%d') &gt;= date_format(#{params.beginZAFKRQ},'%y%m%d')
</if>
<if test="params.endZAFKRQ != null and params.endZAFKRQ != ''"><!-- 结束时间检索 -->
AND date_format(d.ZAFKRQ,'%y%m%d') &lt;= date_format(#{params.endZAFKRQ},'%y%m%d')
</if>
<if test="TRXFJLSL != null "> and TRXFJLSL = #{TRXFJLSL}</if> <if test="TRXFJLSL != null "> and TRXFJLSL = #{TRXFJLSL}</if>
<if test="TRXFCLSL != null "> and TRXFCLSL = #{TRXFCLSL}</if> <if test="TRXFCLSL != null "> and TRXFCLSL = #{TRXFCLSL}</if>
<if test="QFQZSL != null "> and QFQZSL = #{QFQZSL}</if> <if test="QFQZSL != null "> and QFQZSL = #{QFQZSL}</if>

51
basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java
View File

@ -1,7 +1,6 @@
package basepro.manager.service; package basepro.manager.service;
import basepro.manager.pojo.TbChryxxb; import basepro.manager.pojo.TbChryxxb;
import guo.ping.e3mall.common.page.TableDataInfo;
import java.util.List; import java.util.List;
@ -15,18 +14,11 @@ public interface ITbChryxxbService
{ {
/** /**
* 查询检查站查获人员信息 * 查询检查站查获人员信息
* *
* @param id 检查站查获人员信息ID * @param HCRYBH 检查站查获人员信息ID
* @return 检查站查获人员信息 * @return 检查站查获人员信息
*/ */
public TbChryxxb selectTbChryxxbById(Integer id); public TbChryxxb selectTbChryxxbById(String HCRYBH);
/**
* 查询检查站查获人员信息
*
* @param HCRYBH 检查站查获人员信息编号
* @return 检查站查获人员信息
*/
public TbChryxxb selectTbChryxxbByHcrybh(String HCRYBH);
/** /**
* 查询检查站查获人员信息列表 * 查询检查站查获人员信息列表
@ -34,7 +26,6 @@ public interface ITbChryxxbService
* @param tbChryxxb 检查站查获人员信息 * @param tbChryxxb 检查站查获人员信息
* @return 检查站查获人员信息集合 * @return 检查站查获人员信息集合
*/ */
public TableDataInfo selectTbChryxxbList(TbChryxxb tbChryxxb, Integer pageNum, Integer pageSize);
public List<TbChryxxb> selectTbChryxxbList(TbChryxxb tbChryxxb); public List<TbChryxxb> selectTbChryxxbList(TbChryxxb tbChryxxb);
/** /**
@ -53,43 +44,19 @@ public interface ITbChryxxbService
*/ */
public int updateTbChryxxb(TbChryxxb tbChryxxb); public int updateTbChryxxb(TbChryxxb tbChryxxb);
/**
* 删除检查站查获人员信息
*
* @param HCRYBH 检查站查获人员信息ID
* @return 结果
*/
public int deleteTbChryxxbByHcrybh(String HCRYBH);
/** /**
* 批量删除检查站查获人员信息 * 批量删除检查站查获人员信息
* *
* @param HCRYBHs 需要删除的数据ID
* @return 结果
*/
public int deleteTbChryxxbByHcrybhs(String HCRYBHs);
/**
* 删除检查站查获人员信息
*
* @param id 检查站查获人员信息ID
* @return 结果
*/
public int deleteTbChryxxbById(Integer id);
/**
* 批量删除检查站查获人员信息
*
* @param ids 需要删除的数据ID * @param ids 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
public int deleteTbChryxxbByIds(String ids); public int deleteTbChryxxbByIds(String ids);
/** /**
* 从人车物核查表及卡点表获取查货人员信息 * 删除检查站查获人员信息信息
* *
* @param date 盘查日期 * @param HCRYBH 检查站查获人员信息ID
* @return 检查站查获人员信息集合 * @return 结果
*/ */
public List<TbChryxxb> selectTbChryxxbListFromTbCheckPerson(String date); public int deleteTbChryxxbById(String HCRYBH);
} }

2
basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java
View File

@ -1,7 +1,6 @@
package basepro.manager.service; package basepro.manager.service;
import basepro.manager.pojo.TbMdjfjxxxb; import basepro.manager.pojo.TbMdjfjxxxb;
import guo.ping.e3mall.common.page.TableDataInfo;
import java.util.List; import java.util.List;
@ -28,7 +27,6 @@ public interface ITbMdjfjxxxbService
* @return 矛盾纠纷简项信息集合 * @return 矛盾纠纷简项信息集合
*/ */
public List<TbMdjfjxxxb> selectTbMdjfjxxxbList(TbMdjfjxxxb tbMdjfjxxxb); public List<TbMdjfjxxxb> selectTbMdjfjxxxbList(TbMdjfjxxxb tbMdjfjxxxb);
public TableDataInfo selectTbMdjfjxxxbList(TbMdjfjxxxb tbMdjfjxxxb, Integer pageNum, Integer pageSize);
/** /**
* 新增矛盾纠纷简项信息 * 新增矛盾纠纷简项信息

17
basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java
View File

@ -18,9 +18,7 @@ public class TbChryxxb extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Integer id;
/** 检查站核查人员编号 */ /** 检查站核查人员编号 */
@Excel(name = "检查站核查人员编号")
private String HCRYBH; private String HCRYBH;
/** 检查站所属行政区划代码 */ /** 检查站所属行政区划代码 */
@ -48,8 +46,8 @@ public class TbChryxxb extends BaseEntity
private String JCZMC; private String JCZMC;
/** 检查时间 */ /** 检查时间 */
@Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private Date jcsj; private Date jcsj;
public String getJcsjStr() { public String getJcsjStr() {
@ -73,15 +71,7 @@ public class TbChryxxb extends BaseEntity
@Excel(name = "查获人员类别(1：抓获在逃人员，2：劝返涉访人员，3：其他)",readConverterExp = "1=抓获在逃人员,2=劝返涉访人员,3=其他") @Excel(name = "查获人员类别(1：抓获在逃人员，2：劝返涉访人员，3：其他)",readConverterExp = "1=抓获在逃人员,2=劝返涉访人员,3=其他")
private String HCRYLB; private String HCRYLB;
public Integer getId() { public void setHCRYBH(String HCRYBH)
return id;
}
public void setId(Integer id) {
this.id = id;
}
public void setHCRYBH(String HCRYBH)
{ {
this.HCRYBH = HCRYBH; this.HCRYBH = HCRYBH;
} }
@ -176,7 +166,6 @@ public class TbChryxxb extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("HCRYBH", getHCRYBH()) .append("HCRYBH", getHCRYBH())
.append("XZQHDM", getXZQHDM()) .append("XZQHDM", getXZQHDM())
.append("XZQHMC", getXZQHMC()) .append("XZQHMC", getXZQHMC())

71
basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java
View File

@ -5,14 +5,10 @@ import java.util.List;
import basepro.manager.mapper.TbChryxxbMapper; import basepro.manager.mapper.TbChryxxbMapper;
import basepro.manager.pojo.TbChryxxb; import basepro.manager.pojo.TbChryxxb;
import basepro.manager.service.ITbChryxxbService; import basepro.manager.service.ITbChryxxbService;
import com.github.pagehelper.PageHelper;
import guo.ping.e3mall.common.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import com.alibaba.dubbo.config.annotation.Service; import com.alibaba.dubbo.config.annotation.Service;
import basepro.manager.common.core.text.Convert; import basepro.manager.common.core.text.Convert;
import static guo.ping.e3mall.common.page.TablePageUtils.getDataTable;
/** /**
* 检查站查获人员信息Service业务层处理 * 检查站查获人员信息Service业务层处理
* *
@ -27,23 +23,14 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
/** /**
* 查询检查站查获人员信息 * 查询检查站查获人员信息
* *
* @param id 检查站查获人员信息ID * @param HCRYBH 检查站查获人员信息ID
* @return 检查站查获人员信息
*/
public TbChryxxb selectTbChryxxbById(Integer id){
return tbChryxxbMapper.selectTbChryxxbById(id);
}
/**
* 查询检查站查获人员信息
*
* @param HCRYBH 检查站查获人员信息编号
* @return 检查站查获人员信息 * @return 检查站查获人员信息
*/ */
@Override @Override
public TbChryxxb selectTbChryxxbByHcrybh(String HCRYBH) public TbChryxxb selectTbChryxxbById(String HCRYBH)
{ {
return tbChryxxbMapper.selectTbChryxxbByHcrybh(HCRYBH); return tbChryxxbMapper.selectTbChryxxbById(HCRYBH);
} }
/** /**
@ -55,14 +42,7 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
@Override @Override
public List<TbChryxxb> selectTbChryxxbList(TbChryxxb tbChryxxb) public List<TbChryxxb> selectTbChryxxbList(TbChryxxb tbChryxxb)
{ {
List<TbChryxxb> chryxxbList = tbChryxxbMapper.selectTbChryxxbList(tbChryxxb); return tbChryxxbMapper.selectTbChryxxbList(tbChryxxb);
return chryxxbList;
}
public TableDataInfo selectTbChryxxbList(TbChryxxb tbChryxxb, Integer pageNum, Integer pageSize)
{
PageHelper.startPage(pageNum,pageSize);
List<TbChryxxb> chryxxbList = tbChryxxbMapper.selectTbChryxxbList(tbChryxxb);
return getDataTable(chryxxbList);
} }
/** /**
@ -92,13 +72,13 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
/** /**
* 删除检查站查获人员信息对象 * 删除检查站查获人员信息对象
* *
* @param HCRYBHs 需要删除的数据ID * @param ids 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteTbChryxxbByHcrybhs(String HCRYBHs) public int deleteTbChryxxbByIds(String ids)
{ {
return tbChryxxbMapper.deleteTbChryxxbByHcrybhs(Convert.toStrArray(HCRYBHs)); return tbChryxxbMapper.deleteTbChryxxbByIds(Convert.toStrArray(ids));
} }
/** /**
@ -108,39 +88,8 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteTbChryxxbByHcrybh(String HCRYBH) public int deleteTbChryxxbById(String HCRYBH)
{ {
return tbChryxxbMapper.deleteTbChryxxbByHcrybh(HCRYBH); return tbChryxxbMapper.deleteTbChryxxbById(HCRYBH);
}
/**
* 删除检查站查获人员信息
*
* @param id 检查站查获人员信息ID
* @return 结果
*/
public int deleteTbChryxxbById(Integer id){
return tbChryxxbMapper.deleteTbChryxxbById(id);
}
/**
* 批量删除检查站查获人员信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteTbChryxxbByIds(String ids){
return tbChryxxbMapper.deleteTbChryxxbByIds(Convert.toIntArray(ids));
}
/**
* 从人车物核查表及卡点表获取查货人员信息
*
* @param date 盘查日期
* @return 检查站查获人员信息集合
*/
public List<TbChryxxb> selectTbChryxxbListFromTbCheckPerson(String date){
return tbChryxxbMapper.selectTbChryxxbListFromTbCheckPerson(date);
} }
} }

12
basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java
View File

@ -6,16 +6,11 @@ import java.util.UUID;
import basepro.manager.common.utils.DateUtils; import basepro.manager.common.utils.DateUtils;
import basepro.manager.mapper.TbMdjfjxxxbMapper; import basepro.manager.mapper.TbMdjfjxxxbMapper;
import basepro.manager.pojo.TbMdjfjxxxb; import basepro.manager.pojo.TbMdjfjxxxb;
import basepro.manager.pojo.TbXjxdzhxxb;
import basepro.manager.service.ITbMdjfjxxxbService; import basepro.manager.service.ITbMdjfjxxxbService;
import com.alibaba.dubbo.config.annotation.Service; import com.alibaba.dubbo.config.annotation.Service;
import com.github.pagehelper.PageHelper;
import guo.ping.e3mall.common.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import basepro.manager.common.core.text.Convert; import basepro.manager.common.core.text.Convert;
import static guo.ping.e3mall.common.page.TablePageUtils.getDataTable;
/** /**
* 矛盾纠纷简项信息Service业务层处理 * 矛盾纠纷简项信息Service业务层处理
* *
@ -52,13 +47,6 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService
return tbMdjfjxxxbMapper.selectTbMdjfjxxxbList(tbMdjfjxxxb); return tbMdjfjxxxbMapper.selectTbMdjfjxxxbList(tbMdjfjxxxb);
} }
@Override
public TableDataInfo selectTbMdjfjxxxbList(TbMdjfjxxxb tbMdjfjxxxb, Integer pageNum, Integer pageSize) {
PageHelper.startPage(pageNum,pageSize);
List<TbMdjfjxxxb> list = tbMdjfjxxxbMapper.selectTbMdjfjxxxbList(tbMdjfjxxxb);
return getDataTable(list);
}
/** /**
* 新增矛盾纠纷简项信息 * 新增矛盾纠纷简项信息
* *

2
basepro-manager/basepro-manager-web/src/main/java/basepro/manager/BaseProWebApplicationStarter.java
View File

@ -7,11 +7,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@EnableAsync @EnableAsync
@EnableScheduling
public class BaseProWebApplicationStarter extends SpringBootServletInitializer { public class BaseProWebApplicationStarter extends SpringBootServletInitializer {
public static void main(String[] args) { public static void main(String[] args) {

44
basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java
View File

@ -1,44 +0,0 @@
package basepro.manager.controller;
import basepro.manager.pojo.TbChryxxb;
import basepro.manager.service.ISysDictDataService;
import basepro.manager.service.ITbChryxxbService;
import com.alibaba.dubbo.config.annotation.Reference;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Month;
import java.util.Date;
import java.util.List;
@Component
public class InsertChryTask {
@Reference
private ITbChryxxbService tbChryxxbService;
@Reference
private ISysDictDataService sysDictDataService;
// @Scheduled(cron = "0 * * * * *") // 每分钟执行一次
@Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点执行异一次
public void executeEveryMinute() {
/**
* 获取前一天的日期 LocalDate.now()——今天 minusDays(1)——减1天 默认格式：yyyy-MM-dd
*/
LocalDate yesterday = LocalDate.now().minusDays(1);
// 2021-03-07
// LocalDate specificDate = LocalDate.of(2021, Month.MARCH, 7);
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String now = formatter.format(new Date());
System.out.println("抽取查获人员信息任务执行："+now);
List<TbChryxxb> chryxxbList = tbChryxxbService.selectTbChryxxbListFromTbCheckPerson(yesterday.toString());
for (TbChryxxb tbChryxxb : chryxxbList) {
String xzqhmc = sysDictDataService.selectDictLabel("anhui_code", tbChryxxb.getXZQHDM());
tbChryxxb.setXZQHMC(xzqhmc);
tbChryxxbService.insertTbChryxxb(tbChryxxb);
}
}
}

29
basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java
View File

@ -13,9 +13,7 @@ import com.alibaba.dubbo.config.annotation.Reference;
import guo.ping.e3mall.common.annotation.Log; import guo.ping.e3mall.common.annotation.Log;
import guo.ping.e3mall.common.controller.BaseController; import guo.ping.e3mall.common.controller.BaseController;
import guo.ping.e3mall.common.enums.BusinessType; import guo.ping.e3mall.common.enums.BusinessType;
import guo.ping.e3mall.common.page.PageDomain;
import guo.ping.e3mall.common.page.TableDataInfo; import guo.ping.e3mall.common.page.TableDataInfo;
import guo.ping.e3mall.common.page.TableSupport;
import guo.ping.e3mall.common.pojo.AjaxResult; import guo.ping.e3mall.common.pojo.AjaxResult;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -40,6 +38,7 @@ public class TbChryxxbController extends BaseController
@Reference @Reference
private ITbChryxxbService tbChryxxbService; private ITbChryxxbService tbChryxxbService;
@RequiresPermissions("system:chryxxb:view") @RequiresPermissions("system:chryxxb:view")
@GetMapping() @GetMapping()
public String chryxxb() public String chryxxb()
@ -56,11 +55,8 @@ public class TbChryxxbController extends BaseController
public TableDataInfo list(TbChryxxb tbChryxxb) public TableDataInfo list(TbChryxxb tbChryxxb)
{ {
startPage(); startPage();
PageDomain pageDomain = TableSupport.buildPageRequest(); List<TbChryxxb> list = tbChryxxbService.selectTbChryxxbList(tbChryxxb);
Integer pageNum = pageDomain.getPageNum(); return getDataTable(list);
Integer pageSize = pageDomain.getPageSize();
TableDataInfo list = tbChryxxbService.selectTbChryxxbList(tbChryxxb,pageNum,pageSize);
return list;
} }
/** /**
@ -94,7 +90,7 @@ public class TbChryxxbController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult addSave(TbChryxxb tbChryxxb) public AjaxResult addSave(TbChryxxb tbChryxxb)
{ {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Calendar today = Calendar.getInstance(); Calendar today = Calendar.getInstance();
today.add(Calendar.DATE,-1); today.add(Calendar.DATE,-1);
Date jcsj = today.getTime(); Date jcsj = today.getTime();
@ -111,21 +107,10 @@ public class TbChryxxbController extends BaseController
/** /**
* 修改检查站查获人员信息 * 修改检查站查获人员信息
*/ */
/*@GetMapping("/edit/{HCRYBH}") @GetMapping("/edit/{HCRYBH}")
public String edit(@PathVariable("HCRYBH") String HCRYBH, ModelMap mmap) public String edit(@PathVariable("HCRYBH") String HCRYBH, ModelMap mmap)
{ {
TbChryxxb tbChryxxb = tbChryxxbService.selectTbChryxxbByHcrybh(HCRYBH); TbChryxxb tbChryxxb = tbChryxxbService.selectTbChryxxbById(HCRYBH);
mmap.put("tbChryxxb", tbChryxxb);
return prefix + "/edit";
}*/
/**
* 修改检查站查获人员信息
*/
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Integer id, ModelMap mmap)
{
TbChryxxb tbChryxxb = tbChryxxbService.selectTbChryxxbById(id);
mmap.put("tbChryxxb", tbChryxxb); mmap.put("tbChryxxb", tbChryxxb);
return prefix + "/edit"; return prefix + "/edit";
} }
@ -139,7 +124,7 @@ public class TbChryxxbController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult editSave(TbChryxxb tbChryxxb) public AjaxResult editSave(TbChryxxb tbChryxxb)
{ {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Calendar today = Calendar.getInstance(); Calendar today = Calendar.getInstance();
today.add(Calendar.DATE,-1); today.add(Calendar.DATE,-1);
Date jcsj = today.getTime(); Date jcsj = today.getTime();

9
basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java
View File

@ -7,8 +7,6 @@ import basepro.manager.pojo.TbMdjfjxxxb;
import basepro.manager.service.ITbMdjfjxxxbService; import basepro.manager.service.ITbMdjfjxxxbService;
import com.alibaba.dubbo.config.annotation.Reference; import com.alibaba.dubbo.config.annotation.Reference;
import guo.ping.e3mall.common.annotation.Log; import guo.ping.e3mall.common.annotation.Log;
import guo.ping.e3mall.common.page.PageDomain;
import guo.ping.e3mall.common.page.TableSupport;
import guo.ping.e3mall.common.pojo.AjaxResult; import guo.ping.e3mall.common.pojo.AjaxResult;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -53,11 +51,8 @@ public class TbMdjfjxxxbController extends BaseController
public TableDataInfo list(TbMdjfjxxxb tbMdjfjxxxb) public TableDataInfo list(TbMdjfjxxxb tbMdjfjxxxb)
{ {
startPage(); startPage();
PageDomain pageDomain = TableSupport.buildPageRequest(); List<TbMdjfjxxxb> list = tbMdjfjxxxbService.selectTbMdjfjxxxbList(tbMdjfjxxxb);
Integer pageNum = pageDomain.getPageNum(); return getDataTable(list);
Integer pageSize = pageDomain.getPageSize();
TableDataInfo list = tbMdjfjxxxbService.selectTbMdjfjxxxbList(tbMdjfjxxxb,pageNum,pageSize);
return list;
} }
/** /**

6
basepro-manager/basepro-manager-web/src/main/resources/templates/chry/add.html
View File

@ -71,7 +71,7 @@
<div class="col-sm-7"> <div class="col-sm-7">
<div class="input-group date"> <div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="jcsjStr" class="form-control" placeholder="检查时间" type="text" required> <input name="jcsjStr" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div> </div>
</div> </div>
</div> </div>
@ -95,8 +95,8 @@
} }
$("input[name='jcsjStr']").datetimepicker({ $("input[name='jcsjStr']").datetimepicker({
format: "yyyy-mm-dd hh:ii:ss", format: "yyyy-mm-dd",
minView: 0, minView: "month",
autoclose: true autoclose: true
}); });
function selectDeptTree() { function selectDeptTree() {

12
basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html
View File

@ -110,13 +110,9 @@
checkbox: true checkbox: true
}, },
{ {
field : 'id', field : 'hcrybh',
title : '主键',
visible: false
},
{
field : 'hcrybh',
title : '检查站核查人员编号', title : '检查站核查人员编号',
visible: false
}, },
{ {
field : 'xzqhdm', field : 'xzqhdm',
@ -165,8 +161,8 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.hcrybh + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.hcrybh + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
}] }]

9
basepro-manager/basepro-manager-web/src/main/resources/templates/chry/edit.html
View File

@ -7,11 +7,10 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-chryxxb-edit" th:object="${tbChryxxb}"> <form class="form-horizontal m" id="form-chryxxb-edit" th:object="${tbChryxxb}">
<input name="id" class="form-control" type="text" th:field="*{id}">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">核查人员编号：</label> <label class="col-sm-4 control-label is-required">核查人员编号：</label>
<div class="col-sm-7"> <div class="col-sm-7">
<input name="HCRYBH" class="form-control" type="text" th:field="*{HCRYBH}" required> <input name="HCRYBH" disabled class="form-control" type="text" th:field="*{HCRYBH}" required>
</div> </div>
</div> </div>
@ -74,7 +73,7 @@
<div class="col-sm-7"> <div class="col-sm-7">
<div class="input-group date"> <div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="jcsjStr" th:value="${#dates.format(tbChryxxb.jcsj, 'yyyy-MM-dd hh:mm:ss')}" class="form-control" placeholder="检查时间" type="text" required> <input name="jcsjStr" th:value="${#dates.format(tbChryxxb.jcsj, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div> </div>
</div> </div>
</div> </div>
@ -95,8 +94,8 @@
} }
$("input[name='jcsjStr']").datetimepicker({ $("input[name='jcsjStr']").datetimepicker({
format: "yyyy-mm-dd hh:ii:ss HH:mm:ss", format: "yyyy-mm-dd",
minView: 0, minView: "month",
autoclose: true autoclose: true
}); });
function selectDeptTree() { function selectDeptTree() {