From d1aed48ea478df7cd017c4e956a40ad1b06ddeb6 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Thu, 31 Jul 2025 14:07:37 +0800 Subject: [PATCH] 1 --- .../item/EnOilDepotsController.java | 1 - .../item/EnOilManagementController.java | 1 - .../com/hfkj/dao/EnOilManagementMapper.java | 180 ------------------ 3 files changed, 182 deletions(-) diff --git a/bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java b/bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java index aa5e54c..622d6a8 100644 --- a/bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java +++ b/bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java @@ -257,7 +257,6 @@ public class EnOilDepotsController { param.put("oilDepotName", oilDepotName); param.put("contactPerson", contactPerson); param.put("status", status); - param.put("createUser", sessionModel.getAccount().getId()); PageHelper.startPage(pageNum, pageSize); return ResponseMsgUtil.success(new PageInfo<>(enOilDepotsService.getList(param))); diff --git a/bweb/src/main/java/com/bweb/controller/item/EnOilManagementController.java b/bweb/src/main/java/com/bweb/controller/item/EnOilManagementController.java index 508fbed..0feb2fa 100644 --- a/bweb/src/main/java/com/bweb/controller/item/EnOilManagementController.java +++ b/bweb/src/main/java/com/bweb/controller/item/EnOilManagementController.java @@ -79,7 +79,6 @@ public class EnOilManagementController { // 变更后库存 BigDecimal changeStock = BigDecimal.ZERO; - // 当类型为出库 if (body.getType() == 1) { if ( diff --git a/service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java b/service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java index 856ef8f..e69de29 100644 --- a/service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java +++ b/service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java @@ -1,180 +0,0 @@ -package com.hfkj.dao; - -import com.hfkj.entity.EnOilManagement; -import com.hfkj.entity.EnOilManagementExample; -import java.util.List; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.DeleteProvider; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.InsertProvider; -import org.apache.ibatis.annotations.Options; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Result; -import org.apache.ibatis.annotations.Results; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.SelectProvider; -import org.apache.ibatis.annotations.Update; -import org.apache.ibatis.annotations.UpdateProvider; -import org.apache.ibatis.type.JdbcType; -import org.springframework.stereotype.Repository; - -/** - * - * 代码由工具生成,请勿修改!!! - * 如果需要扩展请在其父类进行扩展 - * - **/ -@Repository -public interface EnOilManagementMapper extends EnOilManagementMapperExt { - @SelectProvider(type=EnOilManagementSqlProvider.class, method="countByExample") - long countByExample(EnOilManagementExample example); - - @DeleteProvider(type=EnOilManagementSqlProvider.class, method="deleteByExample") - int deleteByExample(EnOilManagementExample example); - - @Delete({ - "delete from en_oil_management", - "where id = #{id,jdbcType=BIGINT}" - }) - int deleteByPrimaryKey(Long id); - - @Insert({ - "insert into en_oil_management (oil_depots_id, `type`, ", - "transport_car_id, transport_car_no, ", - "oil_type, supplier, ", - "num, before_num, ", - "change_num, remark, ", - "img, sign_img, `status`, ", - "create_user, create_user_name, ", - "create_time, update_user, ", - "update_user_name, update_time, ", - "ext_1, ext_2, ext_3)", -<<<<<<< HEAD - "values (#{oilDepotsId,jdbcType=BIGINT}, #{type,jdbcType=INTEGER}, ", - "#{transportCarId,jdbcType=BIGINT}, #{transportCarNo,jdbcType=VARCHAR}, ", - "#{oilType,jdbcType=INTEGER}, #{supplier,jdbcType=VARCHAR}, ", - "#{num,jdbcType=DECIMAL}, #{beforeNum,jdbcType=DECIMAL}, ", -======= - "values (#{type,jdbcType=INTEGER}, #{transportCarId,jdbcType=BIGINT}, ", - "#{transportCarNo,jdbcType=VARCHAR}, #{oilType,jdbcType=INTEGER}, ", - "#{supplier,jdbcType=VARCHAR}, #{num,jdbcType=DECIMAL}, #{beforeNum,jdbcType=DECIMAL}, ", ->>>>>>> 0d53478356273b9edc2a9c765bde3c6ddf2ac177 - "#{changeNum,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, ", - "#{img,jdbcType=VARCHAR}, #{signImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", - "#{createUser,jdbcType=BIGINT}, #{createUserName,jdbcType=VARCHAR}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, ", - "#{updateUserName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" - }) - @Options(useGeneratedKeys=true,keyProperty="id") - int insert(EnOilManagement record); - - @InsertProvider(type=EnOilManagementSqlProvider.class, method="insertSelective") - @Options(useGeneratedKeys=true,keyProperty="id") - int insertSelective(EnOilManagement record); - - @SelectProvider(type=EnOilManagementSqlProvider.class, method="selectByExample") - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="oil_depots_id", property="oilDepotsId", jdbcType=JdbcType.BIGINT), - @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), - @Result(column="transport_car_id", property="transportCarId", jdbcType=JdbcType.BIGINT), - @Result(column="transport_car_no", property="transportCarNo", jdbcType=JdbcType.VARCHAR), - @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER), - @Result(column="supplier", property="supplier", jdbcType=JdbcType.VARCHAR), - @Result(column="num", property="num", jdbcType=JdbcType.DECIMAL), - @Result(column="before_num", property="beforeNum", jdbcType=JdbcType.DECIMAL), - @Result(column="change_num", property="changeNum", jdbcType=JdbcType.DECIMAL), - @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), - @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), - @Result(column="sign_img", property="signImg", jdbcType=JdbcType.VARCHAR), - @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), - @Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT), - @Result(column="create_user_name", property="createUserName", jdbcType=JdbcType.VARCHAR), - @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="update_user", property="updateUser", jdbcType=JdbcType.BIGINT), - @Result(column="update_user_name", property="updateUserName", jdbcType=JdbcType.VARCHAR), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), - @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), - @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) - }) - List selectByExample(EnOilManagementExample example); - - @Select({ - "select", -<<<<<<< HEAD - "id, oil_depots_id, `type`, transport_car_id, transport_car_no, oil_type, supplier, ", - "num, before_num, change_num, remark, img, sign_img, `status`, create_user, create_user_name, ", -======= - "id, `type`, transport_car_id, transport_car_no, oil_type, supplier, num, before_num, ", - "change_num, remark, img, sign_img, `status`, create_user, create_user_name, ", ->>>>>>> 0d53478356273b9edc2a9c765bde3c6ddf2ac177 - "create_time, update_user, update_user_name, update_time, ext_1, ext_2, ext_3", - "from en_oil_management", - "where id = #{id,jdbcType=BIGINT}" - }) - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="oil_depots_id", property="oilDepotsId", jdbcType=JdbcType.BIGINT), - @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), - @Result(column="transport_car_id", property="transportCarId", jdbcType=JdbcType.BIGINT), - @Result(column="transport_car_no", property="transportCarNo", jdbcType=JdbcType.VARCHAR), - @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER), - @Result(column="supplier", property="supplier", jdbcType=JdbcType.VARCHAR), - @Result(column="num", property="num", jdbcType=JdbcType.DECIMAL), - @Result(column="before_num", property="beforeNum", jdbcType=JdbcType.DECIMAL), - @Result(column="change_num", property="changeNum", jdbcType=JdbcType.DECIMAL), - @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), - @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), - @Result(column="sign_img", property="signImg", jdbcType=JdbcType.VARCHAR), - @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), - @Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT), - @Result(column="create_user_name", property="createUserName", jdbcType=JdbcType.VARCHAR), - @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="update_user", property="updateUser", jdbcType=JdbcType.BIGINT), - @Result(column="update_user_name", property="updateUserName", jdbcType=JdbcType.VARCHAR), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), - @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), - @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) - }) - EnOilManagement selectByPrimaryKey(Long id); - - @UpdateProvider(type=EnOilManagementSqlProvider.class, method="updateByExampleSelective") - int updateByExampleSelective(@Param("record") EnOilManagement record, @Param("example") EnOilManagementExample example); - - @UpdateProvider(type=EnOilManagementSqlProvider.class, method="updateByExample") - int updateByExample(@Param("record") EnOilManagement record, @Param("example") EnOilManagementExample example); - - @UpdateProvider(type=EnOilManagementSqlProvider.class, method="updateByPrimaryKeySelective") - int updateByPrimaryKeySelective(EnOilManagement record); - - @Update({ - "update en_oil_management", - "set oil_depots_id = #{oilDepotsId,jdbcType=BIGINT},", - "`type` = #{type,jdbcType=INTEGER},", - "transport_car_id = #{transportCarId,jdbcType=BIGINT},", - "transport_car_no = #{transportCarNo,jdbcType=VARCHAR},", - "oil_type = #{oilType,jdbcType=INTEGER},", - "supplier = #{supplier,jdbcType=VARCHAR},", - "num = #{num,jdbcType=DECIMAL},", - "before_num = #{beforeNum,jdbcType=DECIMAL},", - "change_num = #{changeNum,jdbcType=DECIMAL},", - "remark = #{remark,jdbcType=VARCHAR},", - "img = #{img,jdbcType=VARCHAR},", - "sign_img = #{signImg,jdbcType=VARCHAR},", - "`status` = #{status,jdbcType=INTEGER},", - "create_user = #{createUser,jdbcType=BIGINT},", - "create_user_name = #{createUserName,jdbcType=VARCHAR},", - "create_time = #{createTime,jdbcType=TIMESTAMP},", - "update_user = #{updateUser,jdbcType=BIGINT},", - "update_user_name = #{updateUserName,jdbcType=VARCHAR},", - "update_time = #{updateTime,jdbcType=TIMESTAMP},", - "ext_1 = #{ext1,jdbcType=VARCHAR},", - "ext_2 = #{ext2,jdbcType=VARCHAR},", - "ext_3 = #{ext3,jdbcType=VARCHAR}", - "where id = #{id,jdbcType=BIGINT}" - }) - int updateByPrimaryKey(EnOilManagement record); -} \ No newline at end of file