Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!230
This commit is contained in:
super_liu
2021-11-12 13:50:43 +08:00
26 changed files with 1062 additions and 16 deletions
@@ -0,0 +1,32 @@
<?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.adc.da.slrs.sarStandUnqualified.dao.BusinessDeptIssueDao">
<resultMap id="BusinessIssuePage" type="com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue">
<result property="id" column="ID"/>
<result property="lawId" column="law_id"/>
<result property="lawNumber" column="LAWS_NUMBER"/>
<result property="lawName" column="LAWS_NAME"/>
<result property="productType" column="product_type"/>
<result property="implTime" column="impl_time"/>
<result property="implRequire" column="impl_require"/>
<result property="conformSituation" column="conform_situation"/>
<result property="devScheme" column="dev_scheme"/>
<result property="sopTime" column="sop_Time"/>
<result property="completeSituation" column="complete_situation"/>
<result property="timeoutSituation" column="timeout_situation"/>
<result property="responseDept" column="response_dept"/>
<result property="responsePeople" column="response_people"/>
</resultMap>
<select id="findPage" resultMap="BusinessIssuePage">
SELECT
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
FROM
business_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws
ON issue.law_id = laws.ID
${ew.customSqlSegment}
</select>
</mapper>
@@ -0,0 +1,32 @@
<?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.adc.da.slrs.sarStandUnqualified.dao.ProductDeptIssueDao">
<resultMap id="ProductIssuePage" type="com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue">
<result property="id" column="ID"/>
<result property="lawId" column="law_id"/>
<result property="lawsNumber" column="LAWS_NUMBER"/>
<result property="productBusiness" column="product_business"/>
<result property="platform" column="platform"/>
<result property="pojName" column="poj_name"/>
<result property="pojDescription" column="poj_description"/>
<result property="currentNode" column="current_node"/>
<result property="conceptualState" column="conceptual_state"/>
<result property="scheduledIssuanceTime" column="scheduled_issuance_time"/>
<result property="revisedPlan" column="revised_plan"/>
<result property="explanation" column="explanation"/>
<result property="responseDept" column="response_dept"/>
</resultMap>
<select id="findPage" resultMap="ProductIssuePage">
SELECT
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
FROM
product_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws
ON issue.law_id = laws.ID
${ew.customSqlSegment}
</select>
</mapper>