1、前端表单调整

// todo
1、机构国际化修改
2、其他信息补充日志

atms-api/src/main/java/pwc/taxtech/atms/dto/organization/OrganizationReturnRateDto.java

@@ -57,7 +57,7 @@ public class OrganizationReturnRateDto implements Serializable {
      *
      * @mbg.generated
      */
-    private Byte returnRate;
+    private Float returnRate;
 
     /**
      * Database Column Remarks:
@@ -180,7 +180,7 @@ public class OrganizationReturnRateDto implements Serializable {
      *
      * @mbg.generated
      */
-    public Byte getReturnRate() {
+    public Float getReturnRate() {
         return returnRate;
     }
 
@@ -192,7 +192,7 @@ public class OrganizationReturnRateDto implements Serializable {
      *
      * @mbg.generated
      */
-    public void setReturnRate(Byte returnRate) {
+    public void setReturnRate(Float returnRate) {
         this.returnRate = returnRate;
     }
 

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrgExtraServiceImpl.java

@@ -47,7 +47,7 @@ public class OrgExtraServiceImpl extends BaseService{
             OrganizationInvoice organizationInvoice = new OrganizationInvoice();
             beanUtil.copyProperties(oid,organizationInvoice);
             organizationInvoice.setId(idService.nextId());
-            organizationInvoiceMapper.insert(organizationInvoice);
+            organizationInvoiceMapper.insertSelective(organizationInvoice);
         });
         return new OperationResultDto(true);
     }
@@ -87,7 +87,7 @@ public class OrgExtraServiceImpl extends BaseService{
             OrganizationAccountingRate organizationAccountingRate = new OrganizationAccountingRate();
             beanUtil.copyProperties(oard,organizationAccountingRate);
             organizationAccountingRate.setId(idService.nextId());
-            organizationAccountingRateMapper.insert(organizationAccountingRate);
+            organizationAccountingRateMapper.insertSelective(organizationAccountingRate);
         });
         return new OperationResultDto(true);
     }
@@ -127,7 +127,7 @@ public class OrgExtraServiceImpl extends BaseService{
             OrganizationReturnRate organizationReturnRate = new OrganizationReturnRate();
             beanUtil.copyProperties(orrd,organizationReturnRate);
             organizationReturnRate.setId(idService.nextId());
-            organizationReturnRateMapper.insert(organizationReturnRate);
+            organizationReturnRateMapper.insertSelective(organizationReturnRate);
         });
         return new OperationResultDto(true);
     }
@@ -167,7 +167,7 @@ public class OrgExtraServiceImpl extends BaseService{
             OrganizationApprovedLevyInfo organizationApprovedLevyInfo = new OrganizationApprovedLevyInfo();
             beanUtil.copyProperties(oali,organizationApprovedLevyInfo);
             organizationApprovedLevyInfo.setId(idService.nextId());
-            organizationApprovedLevyInfoMapper.insert(organizationApprovedLevyInfo);
+            organizationApprovedLevyInfoMapper.insertSelective(organizationApprovedLevyInfo);
         });
         return new OperationResultDto(true);
     }
@@ -207,7 +207,7 @@ public class OrgExtraServiceImpl extends BaseService{
             OrganizationTaxOfficer organizationTaxOfficer = new OrganizationTaxOfficer();
             beanUtil.copyProperties(oali,organizationTaxOfficer);
             organizationTaxOfficer.setId(idService.nextId());
-            organizationTaxOfficerMapper.insert(organizationTaxOfficer);
+            organizationTaxOfficerMapper.insertSelective(organizationTaxOfficer);
         });
         return new OperationResultDto(true);
     }
@@ -247,7 +247,7 @@ public class OrgExtraServiceImpl extends BaseService{
             OrganizationTaxRule organizationTaxRule = new OrganizationTaxRule();
             beanUtil.copyProperties(otrd,organizationTaxRule);
             organizationTaxRule.setId(idService.nextId());
-            organizationTaxRuleMapper.insert(organizationTaxRule);
+            organizationTaxRuleMapper.insertSelective(organizationTaxRule);
         });
         return new OperationResultDto(true);
     }

atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationReturnRateMapper.java

@@ -4,13 +4,11 @@ import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
-import org.springframework.stereotype.Repository;
 import pwc.taxtech.atms.MyMapper;
 import pwc.taxtech.atms.entity.OrganizationReturnRate;
 import pwc.taxtech.atms.entity.OrganizationReturnRateExample;
 
 @Mapper
-@Repository
 public interface OrganizationReturnRateMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.

atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationReturnRate.java

@@ -53,7 +53,7 @@ public class OrganizationReturnRate implements Serializable {
      *
      * @mbg.generated
      */
-    private Byte returnRate;
+    private Float returnRate;
 
     /**
      * Database Column Remarks:
@@ -176,7 +176,7 @@ public class OrganizationReturnRate implements Serializable {
      *
      * @mbg.generated
      */
-    public Byte getReturnRate() {
+    public Float getReturnRate() {
         return returnRate;
     }
 
@@ -188,7 +188,7 @@ public class OrganizationReturnRate implements Serializable {
      *
      * @mbg.generated
      */
-    public void setReturnRate(Byte returnRate) {
+    public void setReturnRate(Float returnRate) {
         this.returnRate = returnRate;
     }
 

atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationReturnRateExample.java

@@ -405,52 +405,52 @@ public class OrganizationReturnRateExample {
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateEqualTo(Byte value) {
+        public Criteria andReturnRateEqualTo(Float value) {
             addCriterion("return_rate =", value, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateNotEqualTo(Byte value) {
+        public Criteria andReturnRateNotEqualTo(Float value) {
             addCriterion("return_rate <>", value, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateGreaterThan(Byte value) {
+        public Criteria andReturnRateGreaterThan(Float value) {
             addCriterion("return_rate >", value, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateGreaterThanOrEqualTo(Byte value) {
+        public Criteria andReturnRateGreaterThanOrEqualTo(Float value) {
             addCriterion("return_rate >=", value, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateLessThan(Byte value) {
+        public Criteria andReturnRateLessThan(Float value) {
             addCriterion("return_rate <", value, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateLessThanOrEqualTo(Byte value) {
+        public Criteria andReturnRateLessThanOrEqualTo(Float value) {
             addCriterion("return_rate <=", value, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateIn(List<Byte> values) {
+        public Criteria andReturnRateIn(List<Float> values) {
             addCriterion("return_rate in", values, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateNotIn(List<Byte> values) {
+        public Criteria andReturnRateNotIn(List<Float> values) {
             addCriterion("return_rate not in", values, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateBetween(Byte value1, Byte value2) {
+        public Criteria andReturnRateBetween(Float value1, Float value2) {
             addCriterion("return_rate between", value1, value2, "returnRate");
             return (Criteria) this;
         }
 
-        public Criteria andReturnRateNotBetween(Byte value1, Byte value2) {
+        public Criteria andReturnRateNotBetween(Float value1, Float value2) {
             addCriterion("return_rate not between", value1, value2, "returnRate");
             return (Criteria) this;
         }

atms-dao/src/main/resources/pwc/taxtech/atms/dao/OrganizationReturnRateMapper.xml

@@ -9,7 +9,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="group_name" jdbcType="VARCHAR" property="groupName" />
-    <result column="return_rate" jdbcType="TINYINT" property="returnRate" />
+    <result column="return_rate" jdbcType="REAL" property="returnRate" />
     <result column="start_date" jdbcType="TIMESTAMP" property="startDate" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -142,7 +142,7 @@
       return_rate, start_date, create_time, 
       update_time)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR}, 
-      #{returnRate,jdbcType=TINYINT}, #{startDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{returnRate,jdbcType=REAL}, #{startDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.OrganizationReturnRate">
@@ -185,7 +185,7 @@
         #{groupName,jdbcType=VARCHAR},
       </if>
       <if test="returnRate != null">
-        #{returnRate,jdbcType=TINYINT},
+        #{returnRate,jdbcType=REAL},
       </if>
       <if test="startDate != null">
         #{startDate,jdbcType=TIMESTAMP},
@@ -225,7 +225,7 @@
         group_name = #{record.groupName,jdbcType=VARCHAR},
       </if>
       <if test="record.returnRate != null">
-        return_rate = #{record.returnRate,jdbcType=TINYINT},
+        return_rate = #{record.returnRate,jdbcType=REAL},
       </if>
       <if test="record.startDate != null">
         start_date = #{record.startDate,jdbcType=TIMESTAMP},
@@ -250,7 +250,7 @@
     set id = #{record.id,jdbcType=BIGINT},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       group_name = #{record.groupName,jdbcType=VARCHAR},
-      return_rate = #{record.returnRate,jdbcType=TINYINT},
+      return_rate = #{record.returnRate,jdbcType=REAL},
       start_date = #{record.startDate,jdbcType=TIMESTAMP},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
@@ -272,7 +272,7 @@
         group_name = #{groupName,jdbcType=VARCHAR},
       </if>
       <if test="returnRate != null">
-        return_rate = #{returnRate,jdbcType=TINYINT},
+        return_rate = #{returnRate,jdbcType=REAL},
       </if>
       <if test="startDate != null">
         start_date = #{startDate,jdbcType=TIMESTAMP},
@@ -294,7 +294,7 @@
     update organization_return_rate
     set organization_id = #{organizationId,jdbcType=VARCHAR},
       group_name = #{groupName,jdbcType=VARCHAR},
-      return_rate = #{returnRate,jdbcType=TINYINT},
+      return_rate = #{returnRate,jdbcType=REAL},
       start_date = #{startDate,jdbcType=TIMESTAMP},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}