Merge remote-tracking branch 'origin/main'

zhyc-module/src/main/resources/mapper/dryMatterCorrection/XzDryMatterCorrectionMapper.xml

@@ -14,57 +14,65 @@
     </resultMap>
 
     <sql id="selectXzDryMatterCorrectionVo">
-        select id, datetime, factory, content, standard, coefficient from xz_dry_matter_correction
+        SELECT
+            id,
+            datetime,
+            factory,
+            content,
+            standard,
+            CASE
+                WHEN standard = 0 OR standard IS NULL THEN NULL
+                ELSE content / standard
+                END AS coefficient
+        FROM xz_dry_matter_correction
     </sql>
 
     <select id="selectXzDryMatterCorrectionList" parameterType="XzDryMatterCorrection" resultMap="XzDryMatterCorrectionResult">
         <include refid="selectXzDryMatterCorrectionVo"/>
         <where>
-            <if test="datetime != null "> and datetime = #{datetime}</if>
+            <if test="datetime != null">
+                AND DATE_FORMAT(datetime, '%Y-%m') = DATE_FORMAT(#{datetime}, '%Y-%m')
+            </if>
+            <if test="factory != null and factory != ''">
+                AND factory = #{factory}
+            </if>
+            AND (standard IS NULL OR standard != 0)
         </where>
+        ORDER BY datetime DESC
     </select>
 
     <select id="selectXzDryMatterCorrectionById" parameterType="Long" resultMap="XzDryMatterCorrectionResult">
         <include refid="selectXzDryMatterCorrectionVo"/>
-        where id = #{id}
+        WHERE id = #{id}
     </select>
 
     <insert id="insertXzDryMatterCorrection" parameterType="XzDryMatterCorrection" useGeneratedKeys="true" keyProperty="id">
-        insert into xz_dry_matter_correction
+        INSERT INTO xz_dry_matter_correction
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="datetime != null">datetime,</if>
-            <if test="factory != null">factory,</if>
-            <if test="content != null">content,</if>
-            <if test="standard != null">standard,</if>
-            <if test="coefficient != null">coefficient,</if>
+            datetime, factory, content, standard
         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="datetime != null">#{datetime},</if>
-            <if test="factory != null">#{factory},</if>
-            <if test="content != null">#{content},</if>
-            <if test="standard != null">#{standard},</if>
-            <if test="coefficient != null">#{coefficient},</if>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            #{datetime}, #{factory}, #{content}, #{standard}
         </trim>
     </insert>
 
     <update id="updateXzDryMatterCorrection" parameterType="XzDryMatterCorrection">
-        update xz_dry_matter_correction
-        <trim prefix="SET" suffixOverrides=",">
+        UPDATE xz_dry_matter_correction
+        <set>
             <if test="datetime != null">datetime = #{datetime},</if>
             <if test="factory != null">factory = #{factory},</if>
             <if test="content != null">content = #{content},</if>
             <if test="standard != null">standard = #{standard},</if>
-            <if test="coefficient != null">coefficient = #{coefficient},</if>
-        </trim>
-        where id = #{id}
+        </set>
+        WHERE id = #{id}
     </update>
 
     <delete id="deleteXzDryMatterCorrectionById" parameterType="Long">
-        delete from xz_dry_matter_correction where id = #{id}
+        DELETE FROM xz_dry_matter_correction WHERE id = #{id}
     </delete>
 
-    <delete id="deleteXzDryMatterCorrectionByIds" parameterType="String">
-        delete from xz_dry_matter_correction where id in
+    <delete id="deleteXzDryMatterCorrectionByIds" parameterType="Long[]">
+        DELETE FROM xz_dry_matter_correction WHERE id IN
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

zhyc-module/src/main/resources/mapper/parityCorrection/XzParityCorrectionMapper.xml

@@ -0,0 +1,61 @@
+<?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.zhyc.module.parityCorrection.mapper.XzParityCorrectionMapper">
+    
+    <resultMap type="XzParityCorrection" id="XzParityCorrectionResult">
+        <result property="id"    column="id"    />
+        <result property="parity"    column="parity"    />
+        <result property="coef"    column="coef"    />
+    </resultMap>
+
+    <sql id="selectXzParityCorrectionVo">
+        select id, parity, coef from xz_parity_correction
+    </sql>
+
+    <select id="selectXzParityCorrectionList" parameterType="XzParityCorrection" resultMap="XzParityCorrectionResult">
+        <include refid="selectXzParityCorrectionVo"/>
+        <where>  
+            <if test="parity != null "> and parity = #{parity}</if>
+            <if test="coef != null "> and coef = #{coef}</if>
+        </where>
+    </select>
+    
+    <select id="selectXzParityCorrectionById" parameterType="Long" resultMap="XzParityCorrectionResult">
+        <include refid="selectXzParityCorrectionVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertXzParityCorrection" parameterType="XzParityCorrection" useGeneratedKeys="true" keyProperty="id">
+        insert into xz_parity_correction
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="parity != null">parity,</if>
+            <if test="coef != null">coef,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="parity != null">#{parity},</if>
+            <if test="coef != null">#{coef},</if>
+         </trim>
+    </insert>
+
+    <update id="updateXzParityCorrection" parameterType="XzParityCorrection">
+        update xz_parity_correction
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parity != null">parity = #{parity},</if>
+            <if test="coef != null">coef = #{coef},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteXzParityCorrectionById" parameterType="Long">
+        delete from xz_parity_correction where id = #{id}
+    </delete>
+
+    <delete id="deleteXzParityCorrectionByIds" parameterType="String">
+        delete from xz_parity_correction where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

zhyc-module/src/main/resources/mapper/weightCorrection/XzWegihCorrectionMapper.xml

@@ -0,0 +1,80 @@
+<?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.zhyc.module.weightCorrection.mapper.XzWegihCorrectionMapper">
+
+    <resultMap type="XzWegihCorrection" id="XzWegihCorrectionResult">
+        <result property="id"    column="id"    />
+        <result property="datetime"    column="datetime"    />
+        <result property="factory"    column="factory"    />
+        <result property="actual"    column="actual"    />
+        <result property="systemMilk"    column="system_milk"    />
+        <result property="coefficient"    column="coefficient"    />
+    </resultMap>
+
+    <sql id="selectXzWegihCorrectionVo">
+        select
+            id,
+            datetime,
+            factory,
+            actual,
+            system_milk,
+            CASE
+                WHEN system_milk = 0 THEN 0
+                ELSE ROUND(actual / system_milk, 4)
+                END as coefficient
+        from xz_wegih_correction
+    </sql>
+
+    <select id="selectXzWegihCorrectionList" parameterType="XzWegihCorrection" resultMap="XzWegihCorrectionResult">
+        <include refid="selectXzWegihCorrectionVo"/>
+        <where>
+            <if test="datetime != null "> and datetime = #{datetime}</if>
+            <if test="factory != null  and factory != ''"> and factory = #{factory}</if>
+        </where>
+    </select>
+
+    <select id="selectXzWegihCorrectionById" parameterType="Long" resultMap="XzWegihCorrectionResult">
+        <include refid="selectXzWegihCorrectionVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertXzWegihCorrection" parameterType="XzWegihCorrection" useGeneratedKeys="true" keyProperty="id">
+        insert into xz_wegih_correction
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="datetime != null">datetime,</if>
+            <if test="factory != null">factory,</if>
+            <if test="actual != null">actual,</if>
+            <if test="systemMilk != null">system_milk,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="datetime != null">#{datetime},</if>
+            <if test="factory != null">#{factory},</if>
+            <if test="actual != null">#{actual},</if>
+            <if test="systemMilk != null">#{systemMilk},</if>
+        </trim>
+    </insert>
+
+    <update id="updateXzWegihCorrection" parameterType="XzWegihCorrection">
+        update xz_wegih_correction
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="datetime != null">datetime = #{datetime},</if>
+            <if test="factory != null">factory = #{factory},</if>
+            <if test="actual != null">actual = #{actual},</if>
+            <if test="systemMilk != null">system_milk = #{systemMilk},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteXzWegihCorrectionById" parameterType="Long">
+        delete from xz_wegih_correction where id = #{id}
+    </delete>
+
+    <delete id="deleteXzWegihCorrectionByIds" parameterType="String">
+        delete from xz_wegih_correction where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>