1.许可审批

tangzy

2021-08-13 3633b2237bf5b42a6acbae74ac8b76bb8853b3c0

1.许可审批

 src/main/java/org/springblade/modules/permit/controller/PermitController.java

@@ -37,6 +37,8 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.permit.entity.Permit;
@@ -109,10 +111,11 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入permit")
    public R save(@Valid @RequestBody Permit permit) {
        BladeUser user = AuthUtil.getUser();
        permit.setType("2");
        permit.setStorage("1");
        permit.setPermitime(new Date());
        Map<String, String> param = null;
        permit.setDeptid(user.getDeptId());
        return R.status(permitService.save(permit));
    }


 src/main/java/org/springblade/modules/permit/entity/Permit.java

@@ -141,6 +141,7 @@
    private String representativecell;
    private String contacts;
    private String contactscell;
    private String reason;


}

 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml

@@ -28,6 +28,7 @@
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="reason" property="reason"/>
    </resultMap>



 src/main/java/org/springblade/modules/record/controller/RecordController.java

@@ -89,6 +89,7 @@
    @ApiOperation(value = "新增", notes = "传入record")
    public R save(@Valid @RequestBody Record record) {
        record.setType("2");
        record.setPtype("2");
        return R.status(recordService.save(record));
    }


 src/main/java/org/springblade/modules/record/entity/Record.java

@@ -148,5 +148,13 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private String deptid;
    private String ptype;

    @ApiModelProperty(value = "提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;
    private String reason;


}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml

@@ -24,6 +24,8 @@
        <result column="offices" property="offices"/>
        <result column="officetime" property="officetime"/>
        <result column="deptid" property="deptid"/>
        <result column="permitime" property="permitime"/>
        <result column="ptype" property="ptype"/>
    </resultMap>



 src/main/java/org/springblade/modules/recordk/controller/RecordkController.java

@@ -89,6 +89,7 @@
    @ApiOperation(value = "新增", notes = "传入recordk")
    public R save(@Valid @RequestBody Recordk recordk) {
        recordk.setType("2");
        recordk.setPtype("3");
        return R.status(recordkService.save(recordk));
    }


 src/main/java/org/springblade/modules/recordk/entity/Recordk.java

@@ -147,5 +147,12 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private String deptid;
    private String ptype;

    @ApiModelProperty(value = "提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;
    private String reason;

}

 src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml

@@ -24,6 +24,8 @@
        <result column="offices" property="offices"/>
        <result column="officetime" property="officetime"/>
        <result column="deptid" property="deptid"/>
        <result column="permitime" property="permitime"/>
        <result column="ptype" property="ptype"/>
    </resultMap>



 src/main/java/org/springblade/modules/revoke/controller/RevokeController.java

@@ -90,7 +90,8 @@
    @ApiOperation(value = "新增", notes = "传入revoke")
    public R save(@Valid @RequestBody Revoke revoke) {
        revoke.setType("2");
        revoke.setCtime(new Date());
        revoke.setPtype("4");
        revoke.setPermitime(new Date());
        return R.status(revokeService.save(revoke));
    }


 src/main/java/org/springblade/modules/revoke/entity/Revoke.java

@@ -137,6 +137,7 @@
    @ApiModelProperty(value = "撤销日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date ctime;
    private Date permitime;
    private String deptid;
    private String ptype;
}

 src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml

@@ -23,6 +23,8 @@
        <result column="reason" property="reason"/>
        <result column="ctime" property="ctime"/>
        <result column="deptid" property="deptid"/>
        <result column="permitime" property="permitime"/>
        <result column="ptype" property="ptype"/>
    </resultMap>