20220324

xiaoyong931011

2022-03-28 f09eadc320e24c299a0f90bf12bacd726134fc6e

20220324

 zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java

@@ -124,9 +124,9 @@
                BusParameterSettings newParam=new BusParameterSettings();
                newParam.setParamCode(parameterSetting.getCode());
                newParam.setCompanyId(user.getCompanyId());
                if(parameterSetting.getUserValue().equals(BooleanEnum.TRUE.getDisplayName())){
                if(BooleanEnum.TRUE.getDisplayName().equals(parameterSetting.getUserValue())){
                    newParam.setParamValue(String.valueOf(BooleanEnum.TRUE.getValue()));
                }else if(parameterSetting.getUserValue().equals(BooleanEnum.FALSE.getDisplayName())){
                }else if(BooleanEnum.FALSE.getDisplayName().equals(parameterSetting.getUserValue())){
                    newParam.setParamValue(String.valueOf(BooleanEnum.FALSE.getValue()));
                }else{
                    newParam.setParamValue(parameterSetting.getUserValue());

 zq-erp/src/main/java/com/matrix/system/enums/WeekTypeEnum.java

@@ -10,13 +10,13 @@
public enum WeekTypeEnum implements EnumApiShowAble {


    WEEK_TYPE_ONE(1, "星期一"),
    WEEK_TYPE_TWO(2, "星期二"),
    WEEK_TYPE_THREE(3, "星期三"),
    WEEK_TYPE_FOUR(4, "星期四"),
    WEEK_TYPE_FIVE(5, "星期五"),
    WEEK_TYPE_SIX(6, "星期六"),
    WEEK_TYPE_SEVEN(7, "星期日");
    WEEK_TYPE_ONE(1, "周一"),
    WEEK_TYPE_TWO(2, "周二"),
    WEEK_TYPE_THREE(3, "周三"),
    WEEK_TYPE_FOUR(4, "周四"),
    WEEK_TYPE_FIVE(5, "周五"),
    WEEK_TYPE_SIX(6, "周六"),
    WEEK_TYPE_SEVEN(7, "周日");

    private  Integer value;