10.13bug1

nickchange

2023-10-13 f87aa54781ea269e6be1f74d013c18f5091a8c80

10.13bug1

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java

@@ -653,6 +653,13 @@
    }


    @ResponseBody
    @PostMapping("/queryCity1/")
    public ResultUtil queryCity2(){

        return new ResultUtil(0,null,null,null,null);
    }

    /**
     * 根据城市code获取门店
     * @param cityCode
@@ -686,19 +693,45 @@
        return new ResultUtil(0,0,null,list,null);
    }

    @ResponseBody
    @PostMapping("/queryStore1/")
    public ResultUtil queryStore2(){
//        List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));
////        Map<String,Integer> map = new LinkedHashMap<>();
//        List<SelectDto>  selectDtos = new ArrayList<>();
//        Map<String,Integer> map = new HashMap<>();
////        for (TStore store : list) {
//            SelectDto selectDto = new SelectDto();
//            selectDto.setId(Long.valueOf(store.getId()));
//            selectDto.setValue(store.getName());
//               selectDtos.add(selectDto);
//
//        }
//        map.put("options",selectDtos);

        return new ResultUtil(0,0,null,null,null);
    }


    /**
     * 根据门店id获取场地
     * @param storeId
     * @return
     */
    @ResponseBody
    @PostMapping("/querySite")
    public List<TSite> querySite(Integer storeId){
    @PostMapping("/querySite/{id}")
    public List<TSite> querySite(@PathVariable("id") Integer storeId){
        System.out.println("==storeId==="+storeId);
        List<TSite> list = siteService.list(new QueryWrapper<TSite>().select("id","name").eq("storeId", storeId).eq("state", 1));
        return list;
    }


    @ResponseBody
    @PostMapping("/querySite/")
    public ResultUtil querySite1(){
         return new ResultUtil(0,0,null,null,null);
    }
    /**
     * 获取城市教练
     * @param cityCode

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html

@@ -117,7 +117,10 @@
                "method": "get",
                "messages": {
                },
                "sendOn": ""
                "sendOn": "",
                "requestAdaptor": "",
                "adaptor": "",
                "silent": true
              },
              "onEvent": {
                "change": {
@@ -139,7 +142,7 @@
              "type": "select",
              "label": "所在市：",
              "name": "city",
              "value":"",
              "value": "",
              "id": "u:14bafe37d5f3",
              "multiple": false,
              "mode": "horizontal",
@@ -152,7 +155,10 @@
                "method": "post",
                "messages": {
                },
                "sendOn": "this.province != null &&this.province != ' '"
                "sendOn": "this.province != null &&this.province != ' '",
                "requestAdaptor": "",
                "adaptor": "",
                "silent": true
              },
              "onEvent": {
                "change": {
@@ -168,7 +174,10 @@
              },
              "labelField": "name",
              "valueField": "code",
              "required": true
              "required": true,
              "loadingConfig": {
                "show": true
              }
            },
            {
              "type": "select",
@@ -187,7 +196,10 @@
                "url": "/coursePackage/queryStore1/$city",
                "messages": {
                },
                "sendOn": "this.city != null &&this.city != ' '"
                "sendOn": "this.city != null &&this.city != ' '",
                "requestAdaptor": "",
                "adaptor": "",
                "silent": true
              },
              "labelField": "name",
              "valueField": "id",
@@ -218,14 +230,15 @@
                "leftFixed": "lg"
              },
              "source": {
                "url": "/coursePackage/querySite",
                "url": "/coursePackage/querySite/store",
                "method": "post",
                "messages": {
                },
                "data": {
                  "storeId": "$store"
                },
                "dataType": "form"
                "dataType": "form",
                "requestAdaptor": "",
                "adaptor": "",
                "silent": true,
                "replaceData": true
              },
              "labelField": "name",
              "valueField": "id",

 cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html

@@ -1,4 +1,47 @@
    @layout("/common/_container.html"){

    <style>
        .avatar-uploader .el-upload {
            border: 1px dashed #d9d9d9;
            border-radius: 6px;
            cursor: pointer;
            position: relative;
            height: 100px;
            width: 100px;
            overflow: hidden;
        }

        .avatar-uploader .el-upload:hover {
            border-color: #409EFF;
        }
        .avatar-uploader-icon {
            font-size: 28px;
            color: #8c939d;
            width: 100px;
            height: 100px;
            line-height: 100px;
            margin-top: 32px;
            text-align: center;
        }
        .avatar {
            width: 100px;
            height: 100px;
            display: block;
        }

        .col-sm-12 {
            margin-top: 20px;
        }

        .col-sm-12 select {
            height: 33px;
        }
        #app1{
            margin-left: 255px;
        }


    </style>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">
@@ -155,6 +198,38 @@
                    </div>
                    <input type="hidden" id="detailDrawing" value=""/>
                </div>

    <div class="row" id="app1">
    <div class="form-group">
        <label class="col-sm-3 control-label head-scu-label">*赛事活动图片(请上传不超过五张图片): </label>
        <div class="col-sm-2" style="width: 100%;margin-left: 11%;margin-top: 1%">
            <el-upload
                    :limit="5"
                    class="avatar-uploader"
                    action="/tCouponManage/uploadPic"
                    list-type="picture-card"
                    accept="."
                    :on-success="handleAvatarSuccess"
                    :on-remove="handleRemove">
                <i class="el-icon-plus"></i>
            </el-upload>
            <el-dialog :visible.sync="dialogVisible">
                <img width="100%" :src="imageUrl1" alt="">
            </el-dialog>
        </div>
    </div>

    </div>






    </div>



                <div class="form-group">
                    <label class="col-sm-3 control-label head-scu-label"></label>
                    <label>推荐像素：780x440px</label>
@@ -223,7 +298,52 @@
    </div>
</div>
<script src="${ctxPath}/modular/system/coursePackage/coursePackage_info.js"></script>
<script type="text/javascript">
    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
    <script src="${ctxPath}/js/elementui/index.js"></script>
    <link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
    <script src="${ctxPath}/js/vue/vue.js"></script>

    <script type="text/javascript">

        var vue2 = new Vue({
            el: '#app1',
            props: {
                // 数量限制
                limit: {
                    type: Number,
                    default: 2
                },
            },
            data: {
                autoUpload: true,//自动上传
                imageUrl1: '',//模型数据，用于上传图片完成后图片预览
                dialogVisible: false
            },
            methods: {
                handleAvatarSuccess(res, file) {
                    console.log(TCarInfoDlg.goodsPicArray1)
                    TCarInfoDlg.goodsPicArray1.push(file);
                },
                beforeAvatarUpload(file) {
                    const isLt2M = file.size / 1024 / 1024 < 10;
                    if (!isLt2M) {
                        this.$message.error('上传图片大小不能超过 10MB!');
                    }
                    return isLt2M;
                },
                handleRemove(file, fileList) {
                    TCarInfoDlg.goodsPicArray1 = TCarInfoDlg.goodsPicArray1.filter(item => {
                        return item.uid != file.uid;
                    });
                },
            },
            created() {
            },
        });




    laydate.render({
        elem: '#classStartTime'
        ,type: 'time'

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html

@@ -85,7 +85,7 @@
                <label class="col-sm-3 control-label">举办门店：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="shopId" name="shopId" multiple>
                        <option value="">选择门店</option>

                    </select>
                </div>
            </div>
@@ -267,6 +267,8 @@
        created() {
        },
    });


    laydate.render({
        elem: '#endTime'
        ,type:"date"

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html

@@ -82,7 +82,6 @@
                <label class="col-sm-3 control-label">举办门店：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="shopId" name="shopId">
                        <option value="">选择门店</option>
                        @for(obj in list2){
                        <option   value="${obj.id}" ${obj.id == item.storeId ? 'selected=selected' : ''}>${obj.name}</option>
                        @}
@@ -216,7 +215,18 @@
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>

<script>

    $(document).ready(function() {
        $('#shopId').select2({
            multiple: true,
            closeOnSelect: false
        });
    });

    let id = "${item.imgs}"
    let obj = []


 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js

@@ -174,6 +174,11 @@
        return;
    }
    var shopId = $("#shopId").val();

    if(shopId==""){
        Feng.info("请选择门店");
        return;
    }
    var shopIdString = shopId.join(",");
    var name = $("#name").val();
    if(name==""){
@@ -305,6 +310,12 @@
        return;
    }
    var shopId = $("#shopId").val();
    if(shopId==""){
        Feng.info("请选择门店");
        return;
    }
    var shopIdString = shopId.join(",");

    var name = $("#name").val();
    if(name==""){
        Feng.info("请输入赛事名称");
@@ -389,7 +400,7 @@
    ajax.set("id",$("#id").val());
    ajax.set("provinceCode",pCode);
    ajax.set("cityCode",cCode);
    ajax.set("storeId",shopId);
    ajax.set("storeId",shopIdString);
    ajax.set("name",name);
    ajax.set("sTime",startTime);
    ajax.set("eTime",endTime);

 cloud-server-other/src/main/resources/mapper/SiteMapper.xml

@@ -128,9 +128,6 @@
                and t1.name like concat('%',#{query.name},'%')
            </if>
            and t1.state != 3
            and t1.insuranceEndTime &lt;= DATE_ADD(CURDATE(), INTERVAL 2 MONTH)


        </where>

        ORDER BY insertTime desc