tangzy
2021-08-17 cee42c3d8849a80f180c9fdb469a7389221ab8c3
1.许可审批
8 files modified
29 ■■■■ changed files
src/main/java/org/springblade/modules/permit/entity/Permit.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/record/controller/RecordController.java 7 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/record/entity/Record.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/revoke/entity/Revoke.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -141,7 +141,7 @@
    private String representativecell;
    private String contacts;
    private String contactscell;
    private String reason;
    private String approve;
}
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -28,7 +28,7 @@
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="reason" property="reason"/>
        <result column="approve" property="approve"/>
    </resultMap>
src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -95,7 +95,7 @@
            String id = map.get("id").toString();
            recordService.removeByIds(Func.toLongList(id));
        }
        record.setStorage("0");
        record.setStorage("1");
        return R.status(recordService.save(record));
    }
@@ -153,4 +153,9 @@
    }
    @PostMapping("/selectIn")
    public R selectIn(String cardid) {
        Map map = recordService.selectIn(cardid);
        return R.data(map);
    }
}
src/main/java/org/springblade/modules/record/entity/Record.java
@@ -154,7 +154,7 @@
    @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;
    private String approve;
    private String examinetime;
    private String cardid;
    private String representativecell;
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -97,8 +97,10 @@
            String id = map.get("id").toString();
            recordkService.removeByIds(Func.toLongList(id));
        }
        recordk.setStorage("1");
        recordk.setType("2");
        recordk.setPtype("3");
        recordk.setPermitime(new Date());
        return R.status(recordkService.save(recordk));
    }
@@ -154,4 +156,10 @@
    }
    @PostMapping("/selectIn")
    public R selectIn(String cardid) {
        Map map = recordkService.selectIn(cardid);
        return R.data(map);
    }
}
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -96,6 +96,7 @@
            String id = map.get("id").toString();
            revokeService.removeByIds(Func.toLongList(id));
        }
        revoke.setStorage("1");
        revoke.setType("2");
        revoke.setPtype("4");
        revoke.setPermitime(new Date());
@@ -156,5 +157,10 @@
        return R.status(revokeService.removeByIds(Func.toLongList(ids)));
    }
    @PostMapping("/selectIn")
    public R selectIn(String cardid) {
        Map map = revokeService.selectIn(cardid);
        return R.data(map);
    }
}
src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -145,5 +145,6 @@
    private String contacts;
    private String contactscell;
    private String storage;
    private String approve;
}
src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -30,6 +30,7 @@
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="storage" property="storage"/>
        <result column="approve" property="approve"/>
    </resultMap>