admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

实际进度时间修改

Browse Source
This commit is contained in:
GUO 2023-02-23 22:03:23 +08:00
parent 9d4ca47794
commit efad1ed4d0
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArcFace64.dat
View File

@ -1 +1 @@
EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGEDVIQGKEJIKACHIIXDEELIWCCEEELCVCEHFHAJGIPGIIKJRASJFEHAMIKCIGXAPGEHIIZGFBBJMFJJNGFHUGDGDFGFAITGDAXBGAZGKAMBMDABKBAERDUHDAUDOEBIBGBBMCUIZGABKCABIDMFHFRILIIANEBEWBOAIJHBYFAIREBFQFFCHHREKFTFJJQIAGFDSDZHMHUCGBVHIAUENBCJIBBJDIHHDIQFKFNDEBJCKCFGLJKBMHFAZHTHOIRGLJFDUHWEVFGFHDKIBEKFVCGAQJGCYBZAMHDJBJREAIOJPIAJDCJFXHKHPJTHUBTJPDWISESIEIPISDWDRAMFVFFBJCTFVFAARGJHFIMELIQJEAHFRFQDTERDCCGDCIKCAGBJVDLGHEXEBAWAMAFITJDANGBCRDPBPEECBAVAEBBBYBUERFXCYIOHWAOHQBVDFJGCEFZFHAUJGJNJGAPDRJMESBAFHGACOCDDHCOCCEXDDDVDRAVDEHOGBBRANCXEJFVBIABDLDOAVCQBICYCDIBAXJRBQGVDFHQAKDYEDHRHVAGGUJHIAHSFIFUCIDCBRHZDOASDAIDHCJNDEJCFDHIBCFLCQBYFWGNFKAIJQFKFBAPEBGMDOBXGGCAIUENJHDRATFCHIGBCCGZBDJLHQFSHDINHJEVIJESEWANJFEQIVBAILJLBACPHNCHEMAYHJGBAOHLCTGAGLFWBQHFFPEKBYHDEUAOBAABJSBNFFINFDAAGUJTAVBVDHDTEEFNBSJKJNCODGHEECIRGXARCCFZFBFMDJCDGREDCNFOAWEPFIFCGWEBBZHPFVHDBUHFCHFDACJCGSARHMCMBMDDCRCWHBAZJBHHJMDKFWBKFQIHAFADBLGFCSJBEWFAJLGVGPBNANFPINAHIRIJEYJRFWDPCDCSBEGHHTGMATCWEYGQHGAHEJIEHQDZEHCRIRGLJHDABFJKDKBPGUJFJICIGVHRIZHXDWADHMDTABAXCGJIBLHIBYDJELBYBJIFJNDCCICIJDELBOJBJEBRFZDCBUHXGDBKCVBGGQHUFUJIIYHFAAIBBDCEAYDLFHBDBJCADMDFCDGMAYHLHDBGDSCHCECOEAEYJOIFHZ EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGEDVIQGKEJIKACHIIXDEELIWCCEEELCVCEHFHAJGIPGIIKJRASJFEHAMIKCIGXAPGEHIIZGFBBJMFJJNGFHUGDGDFGFAITGDAXBGAZGKAMBMDABKBAERDUHDAUDOEBIBGBBMCUIZGABKCABIDMFHFRILIIANEBEWBOAIJHBYFAIREBFQFFCHHREKFTFJJQIAGFDSDZHMHUCGBVHIAUENBCJIBBJDIHHDIQFKFNDEBJCKCFGLJKBMHFAZHTHOIRGLJFDUHWEVFGFHDKIBEKFVCGAQJGCYBZAMHDJBJREAIOJPIAJDCJFXHKHPJTHUBTJPDWISESIEIPISDWDRAMFVFFBJCTFVFAARGJHFIMELIQJEAHFRFQDTERDCCGDCIKCAGBJVDLGHEXEBAWAMAFITJDANGBCRDPBPEECBAVAEBRGBDMFGGNDQAYCJFJAHJGGFBEBGEOHZDPILAHJEDIDIFWIOJGJFCTGOHQDEBOEGERJVFXIDJJESFKAPASCMCSAXISBQBSEHDDGZHBAREVALCSCAELEGBJIXIRDKAVADBVCNDPHFIYJJGTDEAPITIHBVFEGNBFJODDFEFZGMIKAYDEDIGWDFECBCJVIAAWDIBVGOFOASFOIRARITJOGOERHZAAEAGUIKCVHRCBHJDRJLBACOFZFTENEWDYCNCWDZHUHTFJDIDFEWDGATCAFUERJDCHFZHDAKJHJGDGINIHEPDAABJEIXHOIDAMDTEHCEGKALDAFTEPGZGHHHEVHSHXIZIWISEYFWGMAEIGEZJCDHJIJPBECUIKEYGJHYGLFAJFDPIBARAFGNEEJGDZAYEIAHGYJJELBHBAIXHWGZECJOHFAJCEBBBAINITDTECIFFTHNBJJUCZGYBVEAEBILFOGXEHBKEYELDKFKFVAWESBAHMCOANDEJLIYFMFFDFCAJNJQJGJSHWAEFHIQCJCLGQIYGYEEJBAKIMGACJFNJUDEGQEUCXHPCWBXHAHDASDHJJFLAHIDJLJFCDBMGVIFBBCRIDCSITGLIEAKAUDCFIGHBZARBFESBEDVJVBQIKGQATGBECBSJJDFDKAMDOAPEUCTAXJLGQBXFCIHEGFNDJESCHEHHPBWBQIO

5
src/main/java/com/zhgd/xmgl/modules/project/entity/ProgressTask.java
View File

@ -136,11 +136,8 @@ public class ProgressTask implements Serializable {
@ApiModelProperty(value = "创建用户id") @ApiModelProperty(value = "创建用户id")
private Long createUserId; private Long createUserId;
/**
* 状态，0未开始 ,1进行中，2已完成 默认未开始
*/
@TableField(value = "status") @TableField(value = "status")
@ApiModelProperty(value = "状态，0未开始 ,1进行中，2已完成 默认未开始") @ApiModelProperty(value = "状态，1：提前 2正常 3延迟")
private Integer status; private Integer status;

4
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java
View File

@ -406,7 +406,9 @@ public class ProgressTaskServiceImpl extends ServiceImpl<ProgressTaskMapper, Pro
Date actualStartDate = progressTask.getActualStartDate(); Date actualStartDate = progressTask.getActualStartDate();
int status; int status;
if (actualStartDate == null || (startDate.getTime() < actualStartDate.getTime())) { if (actualStartDate == null || (startDate.getTime() < actualStartDate.getTime())
|| (progressTask.getActualFinishDate() != null && progressTask.getActualFinishDate().getTime() > progressTask.getFinishDate().getTime())
|| (progressTask.getActualFinishDate() == null && progressTask.getFinishDate().before(new Date()))) {
// 实际开始时间晚于预计开始时间 // 实际开始时间晚于预计开始时间
status = 3; status = 3;
} else if (startDate.getTime() > actualStartDate.getTime()) { } else if (startDate.getTime() > actualStartDate.getTime()) {