pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltProductMapper.java
@@ -23,4 +23,6 @@ List<PltProduct> selectSome(Map<String, Object> params); int deleteLogicById(Long id); List<PltProduct> selectAll(); } pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPlt/PltProductionLineMapper.java
@@ -34,4 +34,5 @@ int deleteLogicById(Long id); List<PltProductionLine> selectAll(); } pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProduct.java
@@ -60,6 +60,9 @@ */ public String dMobile; /** * 是否删除,1是,0否 */ @JSONField(serialize = false) public Boolean deleted; pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductionLine.java
@@ -65,6 +65,10 @@ public String installTime; /** * 是否禁用,1是,0否 */ public Boolean disabled; /** * 是否删除,1是,0否 */ public Boolean deleted; pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
@@ -10,7 +10,7 @@ <result column="image" jdbcType="BIGINT" property="image" /> <result column="director" jdbcType="VARCHAR" property="director" /> <result column="d_mobile" jdbcType="VARCHAR" property="dMobile" /> <result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" /> <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/> <result column="dt" jdbcType="TIMESTAMP" property="dt" /> <result column="remark" jdbcType="VARCHAR" property="remark" /> <collection property="params" ofType="com.dy.pmsGlobal.pojoPlt.PltProductParams" fetchType="eager" select="selectParams" column="id" /> @@ -188,4 +188,12 @@ </if> </trim> </select> <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPlt.PltProduct"> select <include refid="Base_Column_List" /> from plt_product p where p.deleted!=1 order by id desc </select> </mapper> pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml
@@ -5,20 +5,21 @@ <mapper namespace="com.dy.pmsGlobal.daoPlt.PltProductionLineMapper"> <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPlt.PltProductionLine"> <id property="id" column="id" jdbcType="BIGINT"/> <result property="name" column="name" jdbcType="VARCHAR"/> <result property="type" column="type" jdbcType="VARCHAR"/> <result property="factory" column="factory" jdbcType="VARCHAR"/> <result property="director" column="director" jdbcType="VARCHAR"/> <result property="dMobile" column="d_mobile" jdbcType="VARCHAR"/> <result property="installTime" column="install_time" jdbcType="VARCHAR"/> <result property="deleted" column="deleted" jdbcType="TINYINT"/> <result property="remark" column="remark" jdbcType="VARCHAR"/> <result property="dt" column="dt" jdbcType="TIMESTAMP"/> <id property="id" column="id" jdbcType="BIGINT"/> <result property="name" column="name" jdbcType="VARCHAR"/> <result property="type" column="type" jdbcType="VARCHAR"/> <result property="factory" column="factory" jdbcType="VARCHAR"/> <result property="director" column="director" jdbcType="VARCHAR"/> <result property="dMobile" column="d_mobile" jdbcType="VARCHAR"/> <result property="installTime" column="install_time" jdbcType="VARCHAR"/> <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/> <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/> <result property="remark" column="remark" jdbcType="VARCHAR"/> <result property="dt" column="dt" jdbcType="TIMESTAMP"/> </resultMap> <sql id="Base_Column_List"> id,name,type, id,name,type,disabled, factory,director,d_mobile, install_time,deleted,remark,dt </sql> @@ -73,30 +74,33 @@ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductionLine"> update plt_production_line <set> <if test="name != null"> name = #{name,jdbcType=VARCHAR}, </if> <if test="type != null"> type = #{type,jdbcType=VARCHAR}, </if> <if test="factory != null"> factory = #{factory,jdbcType=VARCHAR}, </if> <if test="director != null"> director = #{director,jdbcType=VARCHAR}, </if> <if test="dMobile != null"> d_mobile = #{dMobile,jdbcType=VARCHAR}, </if> <if test="installTime != null"> install_time = #{installTime,jdbcType=VARCHAR}, </if> <if test="deleted != null"> deleted = #{deleted,jdbcType=TINYINT}, </if> <if test="remark != null"> remark = #{remark,jdbcType=VARCHAR}, </if> <if test="name != null"> name = #{name,jdbcType=VARCHAR}, </if> <if test="type != null"> type = #{type,jdbcType=VARCHAR}, </if> <if test="factory != null"> factory = #{factory,jdbcType=VARCHAR}, </if> <if test="director != null"> director = #{director,jdbcType=VARCHAR}, </if> <if test="dMobile != null"> d_mobile = #{dMobile,jdbcType=VARCHAR}, </if> <if test="installTime != null"> install_time = #{installTime,jdbcType=VARCHAR}, </if> <if test="disabled != null"> disabled = #{disabled}, </if> <if test="deleted != null"> deleted = #{deleted,jdbcType=TINYINT}, </if> <if test="remark != null"> remark = #{remark,jdbcType=VARCHAR}, </if> </set> where id = #{id,jdbcType=BIGINT} </update> @@ -164,6 +168,11 @@ and id != #{id} </if> </select> <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPlt.PltProductionLine"> select <include refid="Base_Column_List" /> from plt_production_line where deleted != 1 and disabled != 1 </select> <update id="deleteLogicById" parameterType="java.lang.Long"> update plt_production_line set deleted = 1 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineCtrl.java
@@ -128,5 +128,23 @@ } } /** * 查询所有 * @return */ @GetMapping(path="all") @SsoPowerAop(power = "10300000") @Log("查询所有生产线") public BaseResponse<List<PltProductionLine>> all(){ try { List<PltProductionLine> list = sv.selectAll(); return BaseResponseUtils.buildSuccess(list); }catch (Exception e){ log.error("查询所有生产线异常", e); return BaseResponseUtils.buildException(e.getMessage()); } } } pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proLine/ProLineSv.java
@@ -76,5 +76,8 @@ return rsVo ; } public List<PltProductionLine> selectAll() { return dao.selectAll(); } } pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
@@ -145,4 +145,21 @@ return BaseResponseUtils.buildException(e.getMessage()); } } /** * 查询所有产品 * @return */ @GetMapping(path="all") @SsoPowerAop(power = "10300000") @Log("查询所有产品") public BaseResponse<List<PltProduct>> all(){ try { List<PltProduct> list = proSv.selectAll() ; return BaseResponseUtils.buildSuccess(list); }catch (Exception e){ log.error("查询所有产品异常", e); return BaseResponseUtils.buildException(e.getMessage()); } } } pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
@@ -187,4 +187,7 @@ } public List<PltProduct> selectAll() { return dao.selectAll(); } }