检测时间自动更改

src/dashoo.cn/backend/api/business/items/itemsService.go

@@ -9,10 +9,11 @@ import (
 
 	"dashoo.cn/utils"
 	. "dashoo.cn/utils/db"
+	. "dashoo.cn/backend/api/mydb"
 )
 
 type ItemsService struct {
-	ServiceBase
+	MyServiceBase
 }
 
 func GetItemsService(xormEngine *xorm.Engine) *ItemsService {

src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -1,6 +1,7 @@
 package lims
 
 import (
+	"dashoo.cn/backend/api/business/limscheckequipmentlist"
 	"dashoo.cn/backend/api/business/limsdrillcollar"
 	"dashoo.cn/backend/api/business/limsentrustequipment"
 	"dashoo.cn/backend/api/business/limspetroleumpipe"
@@ -4725,6 +4726,32 @@ func (this *LimsDataEntryController) UpdateEntity() {
 		"UTNumber",
 	}
 	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, id, &model, cols)
+
+	var limsTaskBalance limsdataentry.LimsTaskBalance
+	svc.GetEntityByIdBytbl(this.User.AccCode + LimsTaskBalanceName, model.TaskId, &limsTaskBalance)
+
+	var equipmentList []limsentrustequipment.LimsEntrustEquipment
+	where := "EntrustNo='" + limsTaskBalance.EntrustNo + "' AND PositionCheckId=" + strconv.Itoa(model.PositionCheckId)
+	svc.GetEntitysByWhere(this.User.AccCode + LimsEntrustEquipmentName, where, &equipmentList)
+
+	for _,item := range equipmentList{
+		cols := []string{"LastCheckDate","NextCheckDate"}
+		var entity limscheckequipmentlist.LimsCheckEquipmentList
+		svc.GetEntityByIdBytbl(this.User.AccCode + LimsCheckEquipmentListName, item.DeviceId, &entity)
+		entity.LastCheckDate = model.CheckDate
+		if entity.CycleUnit == "年" {
+			entity.NextCheckDate = model.CheckDate.AddDate(int(entity.Cycle), 0, 0)
+		} else if entity.CycleUnit == "月" {
+			entity.NextCheckDate = model.CheckDate.AddDate(0, int(entity.Cycle), 0)
+		} else if entity.CycleUnit == "日" {
+			entity.NextCheckDate = model.CheckDate.AddDate(0, 0, int(entity.Cycle))
+		}
+
+		where := "Id=" + strconv.Itoa(item.DeviceId)
+		svc.UpdateEntityBywheretbl(this.User.AccCode + LimsCheckEquipmentListName, &entity, cols, where)
+	}
+
+
 	if err == nil {
 		errinfo.Message = "保存成功！"
 		errinfo.Code = 0

src/dashoo.cn/backend/api/controllers/lims/limsentrust.go

@@ -294,7 +294,7 @@ func (this *LimsEnturstController) AddEntrust() {
 	queryCheckDate := this.GetString("querycheckdate")
 	insertEquipmentSQL := "INSERT INTO " + this.User.AccCode + LimsEntrustEquipmentName
 	insertEquipmentSQL += "(Entrustmainid, EntrustNo, Departmentid, Departmentname, Orderno, Positioncheckid, Positioncheck, Positionid, Position, Custno, DeviceId, Devicename, Templatetypeid, Templatetypename, Spec, Specid, Manufacturer, Status, Remark, CreateOn, CreateUserId, CreateBy)"
-	insertEquipmentSQL += " SELECT '" + strconv.Itoa(model.Id) + "' as EntrustMainId, "+ model.EntrustNo +" as EntrustNo, Departmentid, Departmentname, Orderno, Positioncheckid, Positioncheck, Positionid, Position, Custno, Id, Devicename, Templatetypeid, Templatetypename, Spec, Specid, Manufacturer, Status, Remark, now() as CreateOn, '" + this.User.Id + "' as CreateUserId, '" + this.User.Realname + "' as CreateBy FROM "
+	insertEquipmentSQL += " SELECT '" + strconv.Itoa(model.Id) + "' as EntrustMainId, '"+ model.EntrustNo +"' as EntrustNo, Departmentid, Departmentname, Orderno, Positioncheckid, Positioncheck, Positionid, Position, Custno, Id, Devicename, Templatetypeid, Templatetypename, Spec, Specid, Manufacturer, Status, Remark, now() as CreateOn, '" + this.User.Id + "' as CreateUserId, '" + this.User.Realname + "' as CreateBy FROM "
 	insertEquipmentSQL += this.User.AccCode + LimsCheckEquipmentListName
 	insertEquipmentSQL += " WHERE PositionCheckId in (" + strPositionList + ")"
 	insertEquipmentSQL += " and TemplateTypeId=" + strconv.Itoa(model.ProjectTypeId)

src/dashoo.cn/backend/api/controllers/setting/items.go

@@ -1,6 +1,7 @@
 package setting
 
 import (
+	"dashoo.cn/backend/api/business/limscheckequipmentlist"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -115,6 +116,28 @@ func (this *ItemsController) AddDetectionModel() {
 	model.CreateuserId=this.User.Id
 	model.CreateBy=this.User.Realname
 	_,err:=svc.InsertEntityBytblOne("Base_ItemDetails_DetectionCycle",&model)
+
+	var list []limscheckequipmentlist.LimsCheckEquipmentList
+	where := "TemplateTypeId=" + strconv.Itoa(model.Pid)
+	svc.GetEntitysByWhere(this.User.AccCode + LimsCheckEquipmentListName, where, &list)
+
+	for _,item := range list {
+		cols := []string{"NextCheckDate", "Cycle", "CycleUnit"}
+		var entity limscheckequipmentlist.LimsCheckEquipmentList
+		entity.Cycle = float32(model.DetectionNum)
+		entity.CycleUnit = model.DetectionUnit
+		if model.DetectionUnit == "年" {
+			entity.NextCheckDate = item.LastCheckDate.AddDate(int(model.DetectionNum), 0, 0)
+		} else if model.DetectionUnit == "月" {
+			entity.NextCheckDate = item.LastCheckDate.AddDate(0, model.DetectionNum, 0)
+		} else if model.DetectionUnit == "日" {
+			entity.NextCheckDate = item.LastCheckDate.AddDate(0, 0, model.DetectionNum)
+		}
+
+		where := "Id=" + strconv.Itoa(item.Id)
+		svc.UpdateEntityBywheretbl(this.User.AccCode + LimsCheckEquipmentListName, &entity, cols, where)
+	}
+
 	if err == nil {
 		errinfo.Message = utils.AlertProcess("保存成功！")
 		errinfo.Code = 0
@@ -147,6 +170,28 @@ func (this *ItemsController) EditDetectionModel() {
 
 	cols := []string{"DetectionUnit","DetectionNum","ModifiedOn","ModifieduserId","ModifiedBy"}
 	_,err:=svc.UpdateEntityByIdCols(id,&model,cols)
+
+	var list []limscheckequipmentlist.LimsCheckEquipmentList
+	where := "TemplateTypeId=" + strconv.Itoa(model.Pid)
+	svc.GetEntitysByWhere(this.User.AccCode + LimsCheckEquipmentListName, where, &list)
+
+	for _,item := range list {
+		cols := []string{"NextCheckDate", "Cycle", "CycleUnit"}
+		var entity limscheckequipmentlist.LimsCheckEquipmentList
+		entity.Cycle = float32(model.DetectionNum)
+		entity.CycleUnit = model.DetectionUnit
+		if model.DetectionUnit == "年" {
+			entity.NextCheckDate = item.LastCheckDate.AddDate(int(model.DetectionNum), 0, 0)
+		} else if model.DetectionUnit == "月" {
+			entity.NextCheckDate = item.LastCheckDate.AddDate(0, model.DetectionNum, 0)
+		} else if model.DetectionUnit == "日" {
+			entity.NextCheckDate = item.LastCheckDate.AddDate(0, 0, model.DetectionNum)
+		}
+
+		where := "Id=" + strconv.Itoa(item.Id)
+		svc.UpdateEntityBywheretbl(this.User.AccCode + LimsCheckEquipmentListName, &entity, cols, where)
+	}
+
 	if err == nil {
 		errinfo.Message = utils.AlertProcess("保存成功！")
 		errinfo.Code = 0

src/dashoo.cn/frontend_web/src/pages/lims/reportelecground/subdata/datalist.vue

@@ -79,6 +79,12 @@
                     <!--</template>-->
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item label="检测日期">
+                    <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="24">
                   <el-form-item label-width="130px" label="钳形接地电阻表" required>
                     <el-checkbox v-for="item in CGRMeterList" v-model="CGRMeterOptions" :key="item.id" :label="item.Code" :value="item.Code" :disabled="DataStatus != 0 && DataStatus != 5&& DataStatus!=3"></el-checkbox>
@@ -400,6 +406,7 @@
         EntrustCorp: '',
         EntrustCorpName: '',
         formData: {
+          CheckDate: new Date(),
           TestDepartId: '',
           PositionCheckId: '',
           TestDepart: '',

src/dashoo.cn/frontend_web/src/pages/lims/reportequipotent/subdata/datamain.vue

@@ -59,6 +59,12 @@
               <!--</template>-->
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测日期">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="等电位检测仪" required>
               <!--<el-checkbox-group v-model="MainProductsNoOptions" border size="mini">-->
@@ -129,6 +135,7 @@
         PositionCheckId: '0',
         ResistanceStr: '',
         formData: {
+          CheckDate: new Date(),
           TestDepartId: '',
           PositionCheckId: '',
           TestDepart: '',

src/dashoo.cn/frontend_web/src/pages/lims/reportleakprotect/subdata/datamain.vue

@@ -61,6 +61,12 @@
               <!--</template>-->
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测日期">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="漏电保护器测试仪" label-width="150px" required>
               <el-checkbox border size="medium" v-for="item in MainProductsList" v-model="MainProductsNoOptions" :key="item.Id"  :value="item.Code" :label="item.Code"
@@ -128,6 +134,7 @@
           DataEntryId: ''
         },
         formData: {
+          CheckDate: new Date(),
           TestDepartId: '',
           PositionCheckId: '',
           TestDepart: '',

src/dashoo.cn/frontend_web/src/pages/lims/reportlightprotect/subdata/datamain.vue

@@ -59,6 +59,12 @@
               <!--</template>-->
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测日期">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="依据标准">
               <el-select v-model="formData.DetectBasis" filterable placeholder="请选择" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
@@ -148,6 +154,7 @@
         CGRMeterOptions: [],
         GRMeterOptions: [],
         formData: {
+          CheckDate: new Date(),
           TestDepartId: '',
           PositionCheckId: '',
           TestDepart: '',