Commit 474e8bd7 authored by weixin_42327055's avatar weixin_42327055

设备变更审批,app接口更改。

parent a08a4e0b
......@@ -59,6 +59,16 @@ public class TChangeApplyApproval extends BaseEntity
private Long approvalPerson;
private String approvalSign;
public String getApprovalSign() {
return approvalSign;
}
public void setApprovalSign(String approvalSign) {
this.approvalSign = approvalSign;
}
public Long getApprovalPerson() {
return approvalPerson;
}
......
......@@ -66,4 +66,6 @@ public interface TChangeApplyApproverMapper
* @return
*/
int batchInsertTChangeApplyApprover(List<TChangeApplyApprover> changeApplyApproverList);
List<TChangeApplyApprover> selectSignList(Long changeApplyId);
}
......@@ -71,7 +71,16 @@ public class TChangeApplyApproverServiceImpl implements ITChangeApplyApproverSer
@Override
public int updateTChangeApplyApprover(TChangeApplyApprover tChangeApplyApprover)
{
return tChangeApplyApproverMapper.updateTChangeApplyApprover(tChangeApplyApprover);
int a = tChangeApplyApproverMapper.updateTChangeApplyApprover(tChangeApplyApprover);
List<TChangeApplyApprover> list = tChangeApplyApproverMapper.selectSignList(tChangeApplyApprover.getApprovalPerson());
if(list.size()==0){
TChangeApplyApproval approval = tChangeApplyApprovalMapper.selectTChangeApplyApprovalById(tChangeApplyApprover.getChangeApplyId());
if(approval.getChangeApplyStatus().equals("1")){
approval.setChangeApplyStatus("2");
tChangeApplyApprovalMapper.updateTChangeApplyApproval(approval);
}
}
return a;
}
/**
......
......@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isDel" column="is_del" />
<result property="remark" column="remark" />
<result property="approvalPerson" column="approvalPerson" />
<result property="approvalSign" column="approvalSign"/>
</resultMap>
<sql id="selectTChangeApplyApprovalVo">
......@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY enter_time DESC
</select>
<select id="selectTChangeApplyApprovalListApp" parameterType="TChangeApplyApproval" resultMap="TChangeApplyApprovalResult">
SELECT a.* FROM t_change_apply_approver r
SELECT a.*,r.approval_sign as approvalSign FROM t_change_apply_approver r
LEFT JOIN t_change_apply_approval a ON a.`change_apply_id` = r.`change_apply_id`
<where>
<if test="changeUnit != null and changeUnit != ''"> and a.change_unit = #{changeUnit}</if>
......
......@@ -31,6 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectTChangeApplyApproverVo"/>
where change_apply_approver_id = #{changeApplyApproverId}
</select>
<select id="selectSignList" parameterType="Long" resultMap="TChangeApplyApproverResult">
<include refid="selectTChangeApplyApproverVo"/>
where change_apply_id = #{changeApplyId}
</select>
<insert id="insertTChangeApplyApprover" parameterType="TChangeApplyApprover" useGeneratedKeys="true" keyProperty="changeApplyApproverId">
insert into t_change_apply_approver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment