Commit eaf7652d authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents fd3e9cad 646d6c27
...@@ -80,9 +80,8 @@ public class TCompleteMonitorSetController { ...@@ -80,9 +80,8 @@ public class TCompleteMonitorSetController {
* @param id id * @param id id
* @return R * @return R
*/ */
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('archives_tcompletemonitorset_get')") @Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}") @GetMapping("/{id}")
@PreAuthorize("@pms.hasPermission('archives_tcompletemonitorset_get')")
public R<TCompleteMonitorSet> getById(@PathVariable("id") String id) { public R<TCompleteMonitorSet> getById(@PathVariable("id") String id) {
return R.ok(tCompleteMonitorSetService.getById(id)); return R.ok(tCompleteMonitorSetService.getById(id));
} }
......
...@@ -87,6 +87,12 @@ public class TInsuranceUnpurchasePerson extends BaseEntity { ...@@ -87,6 +87,12 @@ public class TInsuranceUnpurchasePerson extends BaseEntity {
@Schema(description = "申请状态 0 草稿 1待提交 2 待审核 3 审核通过 4 审核不通过") @Schema(description = "申请状态 0 草稿 1待提交 2 待审核 3 审核通过 4 审核不通过")
private String status; private String status;
/**
* 1.9.7版本新增:历史申请日期(流程通过)
* 陈宇茜
*/
private String historicalApplicationDate;
/** /**
* 印章附件 * 印章附件
*/ */
......
...@@ -39,4 +39,11 @@ public class TInsuranceUnpurchasePersonAddVo implements Serializable { ...@@ -39,4 +39,11 @@ public class TInsuranceUnpurchasePersonAddVo implements Serializable {
@Schema(description = "错误信息") @Schema(description = "错误信息")
private String message; private String message;
/**
* 1.9.7版本新增:历史申请日期(流程通过)
* 陈宇茜
*/
private String historicalApplicationDate;
} }
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<result property="newLine" column="NEW_LINE"/> <result property="newLine" column="NEW_LINE"/>
<result property="division" column="DIVISION"/> <result property="division" column="DIVISION"/>
<result property="insuranceFlag" column="INSURANCE_FLAG"/> <result property="insuranceFlag" column="INSURANCE_FLAG"/>
<result property="historicalApplicationDate" column="HISTORICAL_APPLICATION_DATE"/>
</resultMap> </resultMap>
<resultMap id="tInsuranceUnpurchasePersonExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonVo"> <resultMap id="tInsuranceUnpurchasePersonExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonVo">
...@@ -73,7 +74,8 @@ ...@@ -73,7 +74,8 @@
a.HAS_CONTAIN_RISKS, a.HAS_CONTAIN_RISKS,
a.NEW_LINE, a.NEW_LINE,
a.DIVISION, a.DIVISION,
a.INSURANCE_FLAG a.INSURANCE_FLAG,
a.HISTORICAL_APPLICATION_DATE
</sql> </sql>
<sql id="tInsuranceUnpurchasePerson_where"> <sql id="tInsuranceUnpurchasePerson_where">
<if test="tInsuranceUnpurchasePerson != null"> <if test="tInsuranceUnpurchasePerson != null">
...@@ -206,7 +208,8 @@ ...@@ -206,7 +208,8 @@
a.ID, a.ID,
a.EMP_NAME empName, a.EMP_NAME empName,
a.EMP_IDCARD_NO empIdcardNo, a.EMP_IDCARD_NO empIdcardNo,
if(a.POST = '--','',post) post if(a.POST = '--','',post) post,
a.HISTORICAL_APPLICATION_DATE
FROM t_insurance_unpurchase_person a FROM t_insurance_unpurchase_person a
where a.PARNET_ID = #{id} where a.PARNET_ID = #{id}
</select> </select>
......
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