523096025 пре 1 година
родитељ
комит
02d68e4868

+ 2 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/EartagUtil.java

@@ -14,7 +14,8 @@ public class EartagUtil {
     public static void main(String[] args) {
 //        String str =  "123456789123456-789";
 //        String str =  "123456789123456-45,456";
-        String str =  "262070202253993-4015";
+//        String str =  "262070202253993-994";
+        String str =  "214062300403006.21462300403016";
         EartagResult eartagCollection = getEartagCollection(str);
         System.out.println(eartagCollection.toString());
         System.out.println(eartagCollection.getEartagList().size());

+ 20 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillSubsidyModifyController.java

@@ -0,0 +1,20 @@
+package com.huimv.farm.damsubsidy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+@RestController
+@RequestMapping("/bill-subsidy-modify")
+public class BillSubsidyModifyController {
+
+}

+ 79 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillSubsidyModify.java

@@ -0,0 +1,79 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_subsidy_modify")
+public class BillSubsidyModify implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 引进奖补数量
+     */
+    private Integer beforeRewardNum;
+
+    /**
+     * 耳标号
+     */
+    private String beforeEartagNo;
+
+    /**
+     * 申报金额
+     */
+    private String beforeApplyMoney;
+
+    /**
+     * 修改后引进奖补数量
+     */
+    private Integer afterRewardNum;
+
+    /**
+     * 修改后耳标号
+     */
+    private String afterEartagNo;
+
+    /**
+     * 修改后申报金额
+     */
+    private Integer afterApplyMoney;
+
+    private Integer updateUserId;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateUserName;
+
+    /**
+     * 补贴单id
+     */
+    private String subsidyId;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

+ 16 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillSubsidyModifyMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.farm.damsubsidy.mapper;
+
+import com.huimv.farm.damsubsidy.entity.BillSubsidyModify;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+public interface BillSubsidyModifyMapper extends BaseMapper<BillSubsidyModify> {
+
+}

+ 16 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillSubsidyModifyService.java

@@ -0,0 +1,16 @@
+package com.huimv.farm.damsubsidy.service;
+
+import com.huimv.farm.damsubsidy.entity.BillSubsidyModify;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+public interface IBillSubsidyModifyService extends IService<BillSubsidyModify> {
+
+}

+ 20 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyModifyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.farm.damsubsidy.service.impl;
+
+import com.huimv.farm.damsubsidy.entity.BillSubsidyModify;
+import com.huimv.farm.damsubsidy.mapper.BillSubsidyModifyMapper;
+import com.huimv.farm.damsubsidy.service.IBillSubsidyModifyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+@Service
+public class BillSubsidyModifyServiceImpl extends ServiceImpl<BillSubsidyModifyMapper, BillSubsidyModify> implements IBillSubsidyModifyService {
+
+}

+ 2 - 2
admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=dev
-spring.profiles.active=formal
+spring.profiles.active=dev
+#spring.profiles.active=formal
 #spring.profiles.active=root
 
 #spring.profiles.active=prod

+ 20 - 0
admin/src/main/resources/mapper/BillSubsidyModifyMapper.xml

@@ -0,0 +1,20 @@
+<?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">
+<mapper namespace="com.huimv.farm.damsubsidy.mapper.BillSubsidyModifyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.BillSubsidyModify">
+        <id column="id" property="id" />
+        <result column="before_reward_num" property="beforeRewardNum" />
+        <result column="before_eartag_no" property="beforeEartagNo" />
+        <result column="before_apply_money" property="beforeApplyMoney" />
+        <result column="after_reward_num" property="afterRewardNum" />
+        <result column="after_eartag_no" property="afterEartagNo" />
+        <result column="after_apply_money" property="afterApplyMoney" />
+        <result column="update_user_id" property="updateUserId" />
+        <result column="update_user_name" property="updateUserName" />
+        <result column="subsidy_id" property="subsidyId" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>